X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a1c661cdb54d0a7e12d0724760cf80d7e478bf..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 32b9a24d1d..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__) @@ -87,12 +91,17 @@ /* Cygwin versions, wchar.h requires sys/types.h */ #ifdef __CYGWIN__ #include <sys/types.h> - extern "C" { + #ifdef __cplusplus + extern "C" { + #endif #endif /* Cygwin */ - #include <wchar.h> - #ifdef __CYGWIN__ + + #include <wchar.h> + + #if defined(__CYGWIN__) && defined(__cplusplus) } - #endif /* Cygwin */ + #endif /* Cygwin and C++ */ + #elif defined(HAVE_WCSTR_H) /* old compilers have relevant declarations here */ #include <wcstr.h> @@ -364,7 +373,13 @@ #define wxAtoi _ttoi #define wxAtol _ttol /* #define wxAtof _tttof -- notice that there is no such thing (why?) */ - #define wxGetenv _tgetenv + /* 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) ((wxChar *)NULL) + #else + #define wxGetenv _tgetenv + #endif #define wxSystem _tsystem /* time.h functions */ @@ -763,7 +778,11 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ headers, so we need to declare it ourselves to be able to use it. */ #if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL) +#ifdef __cplusplus extern "C" +#else + extern +#endif int vsnprintf(char *str, size_t size, const char *format, va_list ap); #endif /* !HAVE_VSNPRINTF_DECL */