mingw32 compilation fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 784b5b9e9dc6660b2734ddf3347cad79172c8990..ce1d83adb2be6e83d87c3385fb0aaa775910b873 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -168,7 +168,10 @@
 #endif // HP-UX
 
 #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
-#include "wx/msw/gccpriv.h"
+    #include "wx/msw/gccpriv.h"
+#else
+    #undef wxCHECK_W32API_VERSION
+    #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
new file mode 100644 (file)
index 0000000..5b130f0
--- /dev/null
+++ b/include/wx/msw/gccpriv.h
@@ -0,0 +1,36 @@
+// MinGW w32api specific stuff
+
+#ifndef _WX_MSW_GCCPRIV_H_
+#define _WX_MSW_GCCPRIV_H_
+
+// check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
+#if defined( HAVE_W32API_H )
+#include <w32api.h>
+#endif
+
+#define wxCHECK_W32API_VERSION( major, minor ) \
+ ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
+ && ( ( __W32API_MAJOR_VERSION > (major) ) \
+      || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) )
+
+// Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
+// are more ms-like (header author is Anders Norlander, hence the name)
+#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+    #ifndef wxUSE_NORLANDER_HEADERS
+        #define wxUSE_NORLANDER_HEADERS 1
+    #endif
+#else
+    #ifndef wxUSE_NORLANDER_HEADERS
+        #define wxUSE_NORLANDER_HEADERS 0
+    #endif
+#endif
+
+// "old" GNUWIN32 is the one without Norlander's headers: it lacks the
+// standard Win32 headers and we define the used stuff ourselves for it
+// in wx/msw/gnuwin32/extra.h
+#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS
+    #define __GNUWIN32_OLD__
+#endif
+
+#endif
+  // _WX_MSW_GCCPRIV_H_

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 8ea215d41671bed74b2c51126fd0af5a32c20a26..8fbd19c903f070846078d74760a954dd8e539373 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -157,6 +157,9 @@ typedef short INT16;
 
 #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
 #include <wx/msw/gccpriv.h>
+#else
+#undef wxCHECK_W32API_VERSION
+#define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
 /* INT32 must hold at least signed 32-bit values. */