From 9ac654169e56b1a4a924f03773e13ad1f3e739c4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 11 Dec 1998 09:48:20 +0000 Subject: [PATCH] regrouped the fix by VZ so that __MWERKS__ comes first, since CW also defines _MSC_VER = 9 , the wrong branch was taken git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 110c18ae7a..41cef19c96 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -104,16 +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) +#if defined( __MWERKS__ ) + #if (__MWERKS__ < 0x1000) || !__option(bool) + typedef unsigned int bool; + #endif +#elif 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 #endif #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)