X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46d492a879f7fec474c0847dd0637593453746eb..0c05fdf3570e8066b8a9a16627562e544306a678:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 68cd97448f..4b5c712f6c 100644
--- 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;