added support for range types to runtime depersister

[wxWidgets.git] / src / common / wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 326c34dbe61aca75fb7d8d6046900bd0331623bf..d8772fce24a26304167775661e0c82f7f72c6f49 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "wxchar.h"
 #endif
 
   #pragma implementation "wxchar.h"
 #endif
 


@@ -1205,7 +1205,7 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
 }
 #endif // wxNEED_WX_STRING_H
 
 }
 #endif // wxNEED_WX_STRING_H
 

-#if defined(__WXMAC__) && !defined(__DARWIN__)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)

 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {
     return fopen( wxMacStringToCString(path), mode );
 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {
     return fopen( wxMacStringToCString(path), mode );


@@ -1392,8 +1392,8 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 

-#if defined( __MWERKS__ ) && !defined(__MACH__)
-#if __MSL__ < 0x00008000
+#if (defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)) || \
+     defined(__WXWINCE__)

 char *strdup(const char *s)
 {
     char *dest = (char*) malloc( strlen( s ) + 1 ) ;
 char *strdup(const char *s)
 {
     char *dest = (char*) malloc( strlen( s ) + 1 ) ;


@@ -1402,21 +1402,16 @@ char *strdup(const char *s)
     return dest ;
 }
 #endif
     return dest ;
 }
 #endif

+
+#if (defined(__MWERKS__) && !defined(__MACH__)) || (defined(__WXWINCE__) && _WIN32_WCE <= 211)
+

 int isascii( int c )
 {
 int isascii( int c )
 {

-        return ( c >= 0 && c < 128 ) ;
-}
-#endif // __MWERKS__
-
-#ifdef __WXWINCE__
-char* strdup(const char* s)
-{
-    char *dest = (char*) malloc( strlen( s ) + 1 ) ;
-    if ( dest )
-        strcpy( dest , s ) ;
-    return dest ;
+    return ( c >= 0 && c < 128 );

 }
 }

+#endif

 
 

+#if defined(__WXWINCE__)

 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);


@@ -1424,15 +1419,11 @@ void *calloc( size_t num, size_t size )
     return ptr;
 }
 
     return ptr;
 }
 

+#if (_WIN32_WCE <= 211)

 int isspace(int c)
 {
     return (c == ' ');
 }
 int isspace(int c)
 {
     return (c == ' ');
 }

-
-int isascii( int c )
-{
-        return ( c >= 0 && c < 128 ) ;
-}

 #endif
 
 #endif
 

-
+#endif