summaryrefslogtreecommitdiff
path: root/lib/win32
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2011-10-08 12:06:34 +0000
committerChris Wilson <chris+github@qwirx.com>2011-10-08 12:06:34 +0000
commit79ea9acc7ab54b22ec4f453b75b372fc96152562 (patch)
treef36e184d4525480a4ab32ed808d67a43cc8a7efd /lib/win32
parent2777ca99f953b738adac92e95158b73c1ef14ee1 (diff)
Silence warnings from new MinGW headers that expect __MINGW_FEATURES__
to be defined. Check for fcntl.h and include it if we have it, not just on MSVC, now that MinGW also defines O_BINARY in newer versions.
Diffstat (limited to 'lib/win32')
-rw-r--r--lib/win32/emu.h5
-rwxr-xr-xlib/win32/getopt_long.cpp1
2 files changed, 6 insertions, 0 deletions
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>