Some additions to the 12-bit patch.

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

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 8fbd19c903f070846078d74760a954dd8e539373..51b8ca1bc45b53a6c6a9cdc7f007c9a77a2a9705 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -169,10 +169,13 @@ 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))))
+/* Note: GnuPRO 00r1 should be tested because it does NOT define INT32 in windows.h */
+/* For this compiler, set the following test to 0. */
+#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