Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / include / wx / wx_cw_cm.h

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 43311efd2164dc18d4adfff82951096aa82fb535..27ff0cd2c5925d74ad939a4badd7caa730358c07 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,3 +1,14 @@
+/*
+ Name:        wx/wx_cw_cm.h
+ Purpose:     wxWidgets definitions for CodeWarrior builds
+ Author:      Stefan Csomor
+ Modified by:
+ Created:
+ RCS-ID:      $Id$
+ Copyright:   (c) Stefan Csomor
+ Licence:     wxWindows licence
+*/
+

 #define MSL_USE_PRECOMPILED_HEADERS 0
 #if __WXDEBUG__
     // mac os assert levels
 #define MSL_USE_PRECOMPILED_HEADERS 0
 #if __WXDEBUG__
     // mac os assert levels


@@ -48,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
     /*


@@ -68,16 +75,3 @@
 
 #define USE_DEFINE
 
 
 #define USE_DEFINE
 

-// in order to avoid problems further down in wxWidgets
-
-#ifdef __cplusplus
-
-extern "C"
-{
-#endif
-    char *strdup(const char *s) ;
-    int isascii( int c ) ;
-#ifdef __cplusplus
-}
-#endif
-