make --static flag act on --cppflags too.

[wxWidgets.git] / src / jpeg / jmorecfg.h

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 853a8da9b752ff438049eb4697b08eaad5938e1a..342acc11f66e42816d3cfeabb9ced2588fd51910 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -155,6 +155,13 @@ typedef unsigned int UINT16;
 typedef short INT16;
 #endif
 
 typedef short INT16;
 #endif
 

+#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. */
 
 /* you may define INT32_DEFINED if it is already defined somewhere */
 /* INT32 must hold at least signed 32-bit values. */
 
 /* you may define INT32_DEFINED if it is already defined somewhere */


@@ -162,9 +169,12 @@ typedef short INT16;
 #ifdef XMD_H
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED
 #ifdef XMD_H
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED

-#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
-      ((defined(__MINGW32__) || defined(__CYGWIN__)) \
-       && ((__GNUC__>=2) && (__GNUC_MINOR__>=95)))
+#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) \
+      || wxCHECK_W32API_VERSION( 0, 5 ) \
+      || ((defined(__MINGW32__) || defined(__CYGWIN__)) \
+      && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>95)))) \
+      || (defined(__MWERKS__) && defined(__WXMSW__))
+

 /* INT32 is defined in windows.h  for these compilers */
 #define INT32_DEFINED
 #include <windows.h>
 /* INT32 is defined in windows.h  for these compilers */
 #define INT32_DEFINED
 #include <windows.h>


@@ -254,6 +264,10 @@ typedef unsigned int JDIMENSION;
 #endif
 
 
 #endif
 
 

+#if (defined(__MWERKS__) && defined(__WXMSW__))
+#define HAVE_BOOLEAN
+#endif
+

 /*
  * On a few systems, type boolean and/or its values FALSE, TRUE may appear
  * in standard header files.  Or you may have conflicts with application-
 /*
  * On a few systems, type boolean and/or its values FALSE, TRUE may appear
  * in standard header files.  Or you may have conflicts with application-