Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch 473558: fixes for CW compilation under MSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-23 20:43:23 +00:00
parent 2c37aade57
commit de85a884d7
9 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/jpeg/jmorecfg.h
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
@@ -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-