__MWERKS__ check now doesn't give compilation error with VC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -104,12 +104,16 @@
|
||||
// VC++ 4.0 is 1000.
|
||||
|
||||
// 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;
|
||||
#elif defined(_MSC_VER) && (_MSC_VER == 1020)
|
||||
#define bool unsigned int
|
||||
#elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
|
||||
typedef unsigned int bool;
|
||||
#elif defined(__MWERKS__)
|
||||
#if (__MWERKS__ < 0x1000) || !__option(bool)
|
||||
typedef unsigned int bool;
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER == 1020)
|
||||
#define bool unsigned int
|
||||
#endif
|
||||
|
||||
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)
|
||||
|
Reference in New Issue
Block a user