From 8c3866ec70ad88dec8a8f2a02132fbe0d8bc2c37 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Oct 2001 20:43:23 +0000 Subject: [PATCH] applied patch 473558: fixes for CW compilation under MSW This is partial cherry-pick of de85a884d77ad5a29b418b343d4d3cc99c127b5e from the main repository. --- jmorecfg.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jmorecfg.h b/jmorecfg.h index f892e57..7641692 100644 --- a/jmorecfg.h +++ b/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 @@ -241,6 +242,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-