applied patch 473558: fixes for CW compilation under MSW

This is partial cherry-pick of de85a884d77ad5a29b418b343d4d3cc99c127b5e
from the main repository.
This commit is contained in:
Vadim Zeitlin 2001-10-23 20:43:23 +00:00 committed by Vadim Zeitlin
parent 10655ce3e5
commit 8c3866ec70

View File

@ -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-