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

__MWERKS__ check now doesn't give compilation error with VC++

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-12-10 21:49:12 +00:00
parent 4a33eba645
commit dc9e1e5691
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/defs.h
View File

@@ -104,16 +104,20 @@
// VC++ 4.0 is 1000. // VC++ 4.0 is 1000.
// Add more tests here for compilers that don't already define bool. // Add more tests here for compilers that don't already define bool.
#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined( __MWERKS__ ) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) || ( __MWERKS__ < 0x1000 || !__option(bool) ) #if defined(_MSC_VER) && (_MSC_VER <= 1000)
typedef unsigned int bool; typedef unsigned int bool;
#endif #elif defined(_MSC_VER) && (_MSC_VER == 1020)
#define bool unsigned int
#if defined(_MSC_VER) && (_MSC_VER == 1020) #elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
#define bool unsigned int typedef unsigned int bool;
#elif defined(__MWERKS__)
#if (__MWERKS__ < 0x1000) || !__option(bool)
typedef unsigned int bool;
#endif
#endif #endif
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)
#define byte unsigned char #define byte unsigned char
#endif #endif
typedef short int WXTYPE; typedef short int WXTYPE;