X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/676a5687088dbed70a176056c00ee39f087517cf..aaedb44c5e7169db22d32e8a335936e3213da33a:/include/wx/wxcrtbase.h diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index f7c77daeb7..09b4487019 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -26,6 +26,10 @@ NB: don't include any wxWidgets headers here because almost all of them include this one! + + NB2: User code should include wx/crt.h instead of including this + header directly. + */ #if !defined(__WXPALMOS5__) @@ -53,7 +57,7 @@ define it ourselves for them */ #ifndef isascii - #if defined(__MWERKS__) + #if defined(__MWERKS__) || defined(__STRICT_ANSI__) #define wxNEED_ISASCII #elif defined(_WIN32_WCE) #if _WIN32_WCE <= 211 @@ -68,7 +72,7 @@ #ifdef _WIN32_WCE #if _WIN32_WCE <= 211 - #define isspace(c) ((c) == _T(' ') || (c) == _T('\t')) + #define isspace(c) ((c) == wxT(' ') || (c) == wxT('\t')) #endif #endif /* _WIN32_WCE */ @@ -176,10 +180,12 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); Mac and OpenVMS do not have wcsdup: */ #if defined(__VISUALC__) && __VISUALC__ >= 1400 #define wxCRT_StrdupA _strdup -#elif !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__) +#elif !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__) && !defined(__STRICT_ANSI__) #define wxCRT_StrdupA strdup #endif -#if defined(__WINDOWS__) + +// all compilers except Cygwin provide _wcsdup() under Windows +#if defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__STRICT_ANSI__) #define wxCRT_StrdupW _wcsdup #elif defined(HAVE_WCSDUP) #define wxCRT_StrdupW wcsdup @@ -222,34 +228,62 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #endif /* HAVE_WCSTOULL */ #endif +/* + Only VC8 and later provide strnlen() and wcsnlen() functions under Windows + and it's also only available starting from Windows CE 6.0 only in CE build. + */ +#if wxCHECK_VISUALC_VERSION(8) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 0x600)) + #ifndef HAVE_STRNLEN + #define HAVE_STRNLEN + #endif + #ifndef HAVE_WCSNLEN + #define HAVE_WCSNLEN + #endif +#endif + +#ifdef HAVE_STRNLEN + #define wxCRT_StrnlenA strnlen +#endif + +#ifdef HAVE_WCSNLEN + #define wxCRT_StrnlenW wcsnlen +#endif /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */ -/* note that we definitely are going to need our own version for widechar - * versions */ -#if !defined(wxCRT_StricmpA) - #if defined(__BORLANDC__) || defined(__WATCOMC__) || \ - defined(__VISAGECPP__) || \ - defined(__EMX__) || defined(__DJGPP__) - #define wxCRT_StricmpA stricmp - #define wxCRT_StrnicmpA strnicmp - #elif defined(__WXPALMOS__) - /* FIXME: There is no equivalent to strnicmp in the Palm OS API. This - * quick hack should do until one can be written. - */ - #define wxCRT_StricmpA StrCaselessCompare - #define wxCRT_StrnicmpA StrNCaselessCompare - #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \ - (defined(__MWERKS__) && defined(__INTEL__)) - #define wxCRT_StricmpA _stricmp - #define wxCRT_StrnicmpA _strnicmp - #elif defined(__UNIX__) || defined(__GNUWIN32__) - #define wxCRT_StricmpA strcasecmp - #define wxCRT_StrnicmpA strncasecmp - /* #else -- use wxWidgets implementation */ +#if defined(__BORLANDC__) || defined(__WATCOMC__) || \ + defined(__VISAGECPP__) || \ + defined(__EMX__) || defined(__DJGPP__) + #define wxCRT_StricmpA stricmp + #define wxCRT_StrnicmpA strnicmp +#elif defined(__WXPALMOS__) + /* FIXME: There is no equivalent to strnicmp in the Palm OS API. This + * quick hack should do until one can be written. + */ + #define wxCRT_StricmpA StrCaselessCompare + #define wxCRT_StrnicmpA StrNCaselessCompare +#elif defined(__SYMANTEC__) || defined(__VISUALC__) || \ + (defined(__MWERKS__) && defined(__INTEL__)) + #define wxCRT_StricmpA _stricmp + #define wxCRT_StrnicmpA _strnicmp +#elif defined(__UNIX__) || (defined(__GNUWIN32__) && !defined(__STRICT_ANSI__)) + #define wxCRT_StricmpA strcasecmp + #define wxCRT_StrnicmpA strncasecmp +/* #else -- use wxWidgets implementation */ +#endif + +#ifdef __VISUALC__ + #define wxCRT_StricmpW _wcsicmp + #define wxCRT_StrnicmpW _wcsnicmp +#elif defined(__UNIX__) + #ifdef HAVE_WCSCASECMP + #define wxCRT_StricmpW wcscasecmp #endif -#endif /* !defined(wxCRT_StricmpA) */ -/* FIXME-UTF8: use wcs(n)casecmp if available for *W versions */ + #ifdef HAVE_WCSNCASECMP + #define wxCRT_StrnicmpW wcsncasecmp + #endif +/* #else -- use wxWidgets implementation */ +#endif #ifdef HAVE_STRTOK_R #define wxCRT_StrtokA(str, sep, last) strtok_r(str, sep, last) @@ -426,7 +460,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha #else /* Unicode filenames */ /* special case: these functions are missing under Win9x with Unicows so we have to implement them ourselves */ - #if wxUSE_UNICODE_MSLU + #if wxUSE_UNICODE_MSLU || defined(__STRICT_ANSI__) WXDLLIMPEXP_BASE FILE* wxMSLU__wfopen(const wchar_t *name, const wchar_t *mode); WXDLLIMPEXP_BASE FILE* wxMSLU__wfreopen(const wchar_t *name, const wchar_t *mode, FILE *stream); WXDLLIMPEXP_BASE int wxMSLU__wrename(const wchar_t *oldname, const wchar_t *newname); @@ -541,7 +575,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); #define wxCRT_AtolW watol /* else: use ANSI versions */ #endif -#elif defined(wxHAVE_TCHAR_SUPPORT) +#elif defined(wxHAVE_TCHAR_SUPPORT) && !defined(__STRICT_ANSI__) #define wxCRT_AtoiW _wtoi #define wxCRT_AtolW _wtol /* _wtof doesn't exist */ @@ -665,10 +699,10 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max, inline size_t wxStrlen(const char *s) { return s ? wxCRT_StrlenA(s) : 0; } inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; } #ifndef wxWCHAR_T_IS_WXCHAR16 - size_t wxStrlen(const wxChar16 *s ); + WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s ); #endif #ifndef wxWCHAR_T_IS_WXCHAR32 - size_t wxStrlen(const wxChar32 *s ); + WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s ); #endif #define wxWcslen wxCRT_StrlenW @@ -677,10 +711,10 @@ inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; } inline char* wxStrdup(const char *s) { return wxCRT_StrdupA(s); } inline wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); } #ifndef wxWCHAR_T_IS_WXCHAR16 - wxChar16* wxStrdup(const wxChar16* s); + WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s); #endif #ifndef wxWCHAR_T_IS_WXCHAR32 - wxChar32* wxStrdup(const wxChar32* s); + WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s); #endif #endif /* __cplusplus */