correction for include name

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index e26ea1f3cb51d995fb7b51f3120c979e2f9dde74..d8772fce24a26304167775661e0c82f7f72c6f49 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #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
 
-#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 );
@@ -1403,7 +1403,8 @@ char *strdup(const char *s)
 }
 #endif
 
-#if (defined(__MWERKS__) && !defined(__MACH__)) || defined(__WXWINCE__)
+#if (defined(__MWERKS__) && !defined(__MACH__)) || (defined(__WXWINCE__) && _WIN32_WCE <= 211)
+
 int isascii( int c )
 {
     return ( c >= 0 && c < 128 );
@@ -1418,8 +1419,11 @@ void *calloc( size_t num, size_t size )
     return ptr;
 }
 
+#if (_WIN32_WCE <= 211)
 int isspace(int c)
 {
     return (c == ' ');
 }
 #endif
+
+#endif