applied patch 473558: fixes for CW compilation under MSW

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 2d8604909460cc0e8402f4b3ff047bba9ad1a6e7..342acc11f66e42816d3cfeabb9ced2588fd51910 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -169,10 +169,11 @@ typedef short INT16;
 #ifdef XMD_H
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED
-#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
-      wxCHECK_W32API_VERSION( 0, 5 ) || \
-      ((defined(__MINGW32__) || defined(__CYGWIN__)) \
-       && ((__GNUC__>2) || ((__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
@@ -263,6 +264,10 @@ typedef unsigned int JDIMENSION;
 #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-