X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f5e2c177cb3f004d676303ad9accb347d882570..823c4e96f9656176562b5baf7d1b64a8a3dfb3d8:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index a2d0492081..59d7a5e55b 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -20,6 +20,10 @@
 
 #include "wx/defs.h"        /* for wxUSE_UNICODE */
 
+#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    char	*strtok_r(char *, const char *, char **);
+#endif
+
 /* check whether we have wchar_t and which size it is if we do */
 #if !defined(wxUSE_WCHAR_T)
     #if defined(__UNIX__)
@@ -372,7 +376,7 @@
     /* there are no env vars at all under CE, so no _tgetenv neither */
     #ifdef __WXWINCE__
         /* can't define as inline function as this is a C file... */
-        #define wxGetenv(name)  NULL
+        #define wxGetenv(name)  ((wxChar *)NULL)
     #else
         #define  wxGetenv    _tgetenv
     #endif