diff options
| -rw-r--r-- | infrastructure/m4/boxbackup_tests.m4 | 2 | ||||
| -rw-r--r-- | infrastructure/m4/vl_lib_readline.m4 | 2 | ||||
| -rw-r--r-- | lib/win32/emu.h | 5 | ||||
| -rwxr-xr-x | lib/win32/getopt_long.cpp | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4 index b9331dec..245c54b8 100644 --- a/infrastructure/m4/boxbackup_tests.m4 +++ b/infrastructure/m4/boxbackup_tests.m4 @@ -126,7 +126,7 @@ esac AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([dlfcn.h getopt.h process.h pwd.h signal.h]) +AC_CHECK_HEADERS([dlfcn.h fcntl.h getopt.h process.h pwd.h signal.h]) AC_CHECK_HEADERS([syslog.h time.h cxxabi.h]) AC_CHECK_HEADERS([netinet/in.h]) AC_CHECK_HEADERS([sys/file.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h]) diff --git a/infrastructure/m4/vl_lib_readline.m4 b/infrastructure/m4/vl_lib_readline.m4 index 29a27ac6..e9cb72b8 100644 --- a/infrastructure/m4/vl_lib_readline.m4 +++ b/infrastructure/m4/vl_lib_readline.m4 @@ -91,9 +91,9 @@ AC_DEFUN([BOX_CHECK_VAR], [ dnl VL_LIB_READLINE_CHECK(name, libraries, headers, history headers) AC_DEFUN([VL_LIB_READLINE_CHECK], [ + ORIG_LIBS="$LIBS" AC_CACHE_CHECK([for $1 library], [vl_cv_lib_$1], [ - ORIG_LIBS="$LIBS" vl_cv_lib_$1="" for readline_lib in $2; do for termcap_lib in "" termcap curses ncurses pdcurses; do diff --git a/lib/win32/emu.h b/lib/win32/emu.h index 151fa2cb..81370a1b 100644 --- a/lib/win32/emu.h +++ b/lib/win32/emu.h @@ -15,6 +15,11 @@ #if ! defined EMU_INCLUDE && defined WIN32 #define EMU_INCLUDE +// Shut up stupid new warnings. Thanks MinGW! Ever heard of "compatibility"? +#ifdef __MINGW32__ +# define __MINGW_FEATURES__ 0 +#endif + // basic types, may be required by other headers since we // don't include sys/types.h diff --git a/lib/win32/getopt_long.cpp b/lib/win32/getopt_long.cpp index 5d910e1b..31695aa0 100755 --- a/lib/win32/getopt_long.cpp +++ b/lib/win32/getopt_long.cpp @@ -58,6 +58,7 @@ */
// #include "Box.h"
+#include "emu.h"
#include <errno.h>
#include <stdarg.h>
|