simpler CW setup (needed for 9.5)

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

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index f860d0efe1d50f2cad905f2b2fef84df1b8eaaaf..27ff0cd2c5925d74ad939a4badd7caa730358c07 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -59,14 +59,10 @@
     #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
     #define OPAQUE_TOOLBOX_STRUCTS 1
     #ifdef __MACH__
     #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
     #define OPAQUE_TOOLBOX_STRUCTS 1
     #ifdef __MACH__

-        #include <ansi_prefix.mach.h>
-        #include <msl_c_version.h>
-        #include <stdint.h>
-        #undef WCHAR_MAX
-        #include <machine/ansi.h>
-    #else
-      #include <ansi_prefix.mac.h>
+               typedef int mbstate_t;
+               #define _MBSTATE_T

     #endif
     #endif

+       #include <mslconfig>

     // for getting the correct expat includes
     #define MACOS_CLASSIC
     /*
     // for getting the correct expat includes
     #define MACOS_CLASSIC
     /*