X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/068cfb66c2b70171633956f36e5957d8981fc36d..6433f6d3165a3f8633f42c59694a9104a7b37a93:/src/jpeg/jmorecfg.h diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h index 8fbd19c903..342acc11f6 100644 --- 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-