reSWIGged

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 68cd97448f7040a442aa220b218186ea05dccad0..4b5c712f6c3b495597302c601f41b591ca83a040 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -440,7 +440,7 @@
             #define wxNEED_WX_STDIO_H
             #define wxNEED_WX_STDLIB_H
             #define wxNEED_WX_TIME_H
-        #elif defined(__MWERKS__) && ( defined(macintosh) || defined(__MACH__) )
+        #elif defined(__MWERKS__) && ( defined(__MSL__) || defined(__MACH__) )
             /* ctype.h functions (wctype.h) */
             #define  wxIsalnum   iswalnum
             #define  wxIsalpha   iswalpha
@@ -637,6 +637,10 @@
     #ifdef HAVE_WCSLEN
         #define wxWcslen wcslen
     #else
+       #if defined( __WXMAC_XCODE__ ) && !defined( __cplusplus )
+       /* xcode native targets are giving multiply defined symbols on regex */
+               static
+       #endif
         inline size_t wxWcslen(const wchar_t *s)
         {
             size_t n = 0;