From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 9 May 2006 14:26:48 +0000 (+0000)
Subject: mbstate-t related fix for CW8.3 compilation
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/65b977e5b3535191e16d1acc43a4e97d5520800d

mbstate-t related fix for CW8.3 compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 0fdf7f444e..e6dbb38425 100644
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -19,7 +19,9 @@
     #error "this file is only for builds with Metrowerks CodeWarrior"
 #endif
 
-#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
+// defined if the compiler does not want the classname repeated for inlines
+// within a class definition
+#define WX_COMP_INLINE_NO_CLASS
 
 #if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
     #pragma old_argmatch on
@@ -55,22 +57,23 @@
     #endif
     #endif
 #elif defined( __WXMAC__)
-    #define USE_PRECOMPILED_MAC_HEADERS  0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    /* Set to 0 if you don't want to use precompiled MacHeaders */
+    #define USE_PRECOMPILED_MAC_HEADERS  0
     #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
     #define OPAQUE_TOOLBOX_STRUCTS 1
-    
-    /*CW9 has mbstate_t*/
-    #if defined(__MACH__) && __MWERKS__ < 0x3200
-		typedef int mbstate_t;
-		#define	_MBSTATE_T
+
+    /* CW8.3+ has mbstate_t */
+    #if defined(__MACH__) && __MWERKS__ < 0x3003
+        typedef int mbstate_t;
+        #define    _MBSTATE_T
     #endif
-    
-    /*CW9 has ssize_t*/
+
+    /* CW9 has ssize_t */
     #if defined(__MACH__) && __MWERKS__ >= 0x3200
         #define HAVE_SSIZE_T
-	#endif
-	
-	#include <mslconfig>
+    #endif
+
+    #include <mslconfig>
     // for getting the correct expat includes
     #define MACOS_CLASSIC
     /*