X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbffcf1117944db24ee8c196440702172dd0923f..823c4e96f9656176562b5baf7d1b64a8a3dfb3d8:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 6e5017ab7e..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__) @@ -371,7 +375,8 @@ /* #define wxAtof _tttof -- notice that there is no such thing (why?) */ /* there are no env vars at all under CE, so no _tgetenv neither */ #ifdef __WXWINCE__ - inline wxChar *wxGetenv(const wxChar *) { return NULL; } + /* can't define as inline function as this is a C file... */ + #define wxGetenv(name) ((wxChar *)NULL) #else #define wxGetenv _tgetenv #endif