diff --git a/configure b/configure index 3d088aa8b..db1a5fe97 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for mbsystem 5.7.9beta54. +# Generated by GNU Autoconf 2.71 for mbsystem 5.7.9beta55. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mbsystem' PACKAGE_TARNAME='mbsystem' -PACKAGE_VERSION='5.7.9beta54' -PACKAGE_STRING='mbsystem 5.7.9beta54' +PACKAGE_VERSION='5.7.9beta55' +PACKAGE_STRING='mbsystem 5.7.9beta55' PACKAGE_BUGREPORT='http://listserver.mbari.org/sympa/arc/mbsystem' PACKAGE_URL='http://www.mbari.org/data/mbsystem/' @@ -1536,7 +1536,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mbsystem 5.7.9beta54 to adapt to many kinds of systems. +\`configure' configures mbsystem 5.7.9beta55 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1611,7 +1611,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mbsystem 5.7.9beta54:";; + short | recursive ) echo "Configuration of mbsystem 5.7.9beta55:";; esac cat <<\_ACEOF @@ -1789,7 +1789,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mbsystem configure 5.7.9beta54 +mbsystem configure 5.7.9beta55 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2325,7 +2325,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mbsystem $as_me 5.7.9beta54, which was +It was created by mbsystem $as_me 5.7.9beta55, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -5396,7 +5396,7 @@ fi # Define the identity of the package. PACKAGE='mbsystem' - VERSION='5.7.9beta54' + VERSION='5.7.9beta55' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -26069,7 +26069,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mbsystem $as_me 5.7.9beta54, which was +This file was extended by mbsystem $as_me 5.7.9beta55, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26138,7 +26138,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -mbsystem config.status 5.7.9beta54 +mbsystem config.status 5.7.9beta55 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7e4a52d0b..f32b88653 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ dnl See README file for copying and redistribution conditions. dnl-------------------------------------------------------------------- dnl Initialize and set version and version date -AC_INIT([mbsystem],[5.7.9beta54],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/]) +AC_INIT([mbsystem],[5.7.9beta55],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/]) AC_DEFINE(VERSION_DATE, ["15 June 2023"], [Set VERSION_DATE define in mb_config.h]) AS_ECHO([" "]) diff --git a/src/bsio/mbbs_defines.h b/src/bsio/mbbs_defines.h index c8534d814..b6e982ca0 100644 --- a/src/bsio/mbbs_defines.h +++ b/src/bsio/mbbs_defines.h @@ -37,6 +37,8 @@ /* CMake build system section */ #ifdef CMAKE_BUILD_SYSTEM + #include + #include #include #include @@ -49,6 +51,14 @@ #include + #ifdef _WIN32 + #include /* To get INT32_MIN, INT32_MAX, etc ... */ + #else + #ifdef HAVE_STDINT_H + #include + #endif + #endif + /* XDR i/o include file */ #ifdef HAVE_RPC_RPC_H #include diff --git a/src/bsio/mbbs_io.c b/src/bsio/mbbs_io.c index 188c10c2e..586162b5c 100644 --- a/src/bsio/mbbs_io.c +++ b/src/bsio/mbbs_io.c @@ -35,13 +35,6 @@ #include #include #include -#ifdef _WIN32 -#include /* To get INT32_MIN, INT32_MAX, etc ... */ -#else -#ifdef HAVE_STDINT_H -#include -#endif -#endif #include "mbbs_defines.h" #include "mbbs_mem.h"