char *strtok_r(char *, const char *, char **);
#endif
+/*
+ Using -std=c++{98,0x} option with mingw32 disables most of standard
+ library extensions, so we can't rely on the presence of common non-ANSI
+ functions, define a special symbol to test for this. Notice that this
+ doesn't need to be done for g++ under Linux where _GNU_SOURCE (which is
+ defined by default) still makes all common extensions available even in
+ ANSI mode.
+ */
+#if defined(__MINGW32__) && defined(__STRICT_ANSI__)
+ #define __WX_STRICT_ANSI_GCC__
+#endif
+
/*
a few compilers don't have the (non standard but common) isascii function,
define it ourselves for them
*/
#ifndef isascii
- #if defined(__MWERKS__)
+ #if defined(__MWERKS__) || defined(__WX_STRICT_ANSI_GCC__)
#define wxNEED_ISASCII
#elif defined(_WIN32_WCE)
#if _WIN32_WCE <= 211
#endif /* __WXWINCE__ */
/* Almost all compiler have strdup(), but not quite all: CodeWarrior under
- Mac and VC++ for Windows CE don't provide it; additionally, gcc under
- Mac and OpenVMS do not have wcsdup: */
-#if defined(__VISUALC__) && __VISUALC__ >= 1400
+ Mac and VC++ for Windows CE don't provide it. Another special case is gcc in
+ strict ANSI mode: normally it doesn't provide strdup() but MinGW does
+ provide it under MSVC-compatible name so test for it before checking
+ __WX_STRICT_ANSI_GCC__. */
+#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || \
+ defined(__MINGW32__)
#define wxCRT_StrdupA _strdup
-#elif !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__)
+#elif !((defined(__MWERKS__) && defined(__WXMAC__)) || \
+ defined(__WXWINCE__) || \
+ defined(__WX_STRICT_ANSI_GCC__))
#define wxCRT_StrdupA strdup
#endif
-// all compilers except Cygwin provide _wcsdup() under Windows
-#if defined(__WINDOWS__) && !defined(__CYGWIN__)
+/* most Windows compilers provide _wcsdup() */
+#if defined(__WINDOWS__) && \
+ !(defined(__CYGWIN__) || defined(__WX_STRICT_ANSI_GCC__))
#define wxCRT_StrdupW _wcsdup
#elif defined(HAVE_WCSDUP)
#define wxCRT_StrdupW wcsdup
(defined(__MWERKS__) && defined(__INTEL__))
#define wxCRT_StricmpA _stricmp
#define wxCRT_StrnicmpA _strnicmp
-#elif defined(__UNIX__) || defined(__GNUWIN32__)
+#elif defined(__UNIX__) || (defined(__GNUWIN32__) && !defined(__WX_STRICT_ANSI_GCC__))
#define wxCRT_StricmpA strcasecmp
#define wxCRT_StrnicmpA strncasecmp
/* #else -- use wxWidgets implementation */
wchar_t** endptr,
int base);
#endif
-#endif // wxLongLong_t
+#endif /* wxLongLong_t */
/* -------------------------------------------------------------------------
#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(__WX_STRICT_ANSI_GCC__)
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);
#define wxCRT_AtolW watol
/* else: use ANSI versions */
#endif
-#elif defined(wxHAVE_TCHAR_SUPPORT)
+#elif defined(wxHAVE_TCHAR_SUPPORT) && !defined(__WX_STRICT_ANSI_GCC__)
#define wxCRT_AtoiW _wtoi
#define wxCRT_AtolW _wtol
/* _wtof doesn't exist */
#endif
#ifdef __DARWIN__
- #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+ #if !defined(__WXOSX_IPHONE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
#define wxNEED_WX_MBSTOWCS
#endif
#endif
------------------------------------------------------------------------- */
#define wxCRT_StrftimeA strftime
-#ifndef __WXPALMOS__
-/* FIXME-UTF8: when is this available? */
-#define wxCRT_StrftimeW wcsftime
-#endif /* ! __WXPALMOS__ */
+#ifdef __SGI__
+ /*
+ IRIX provides not one but two versions of wcsftime(): XPG4 one which
+ uses "const char*" for the third parameter and so can't be used and the
+ correct, XPG5, one. Unfortunately we can't just define _XOPEN_SOURCE
+ high enough to get XPG5 version as this undefines other symbols which
+ make other functions we use unavailable (see <standards.h> for gory
+ details). So just declare the XPG5 version ourselves, we're extremely
+ unlikely to ever be compiled on a system without it. But if we ever do,
+ a configure test would need to be added for it (and _MIPS_SYMBOL_PRESENT
+ should be used to check for its presence during run-time, i.e. it would
+ probably be simpler to just always use our own wxCRT_StrftimeW() below
+ if it does ever become a problem).
+ */
+#ifdef __cplusplus
+ extern "C"
+#endif
+ size_t
+ _xpg5_wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm * );
+ #define wxCRT_StrftimeW _xpg5_wcsftime
+#else
+ /*
+ Assume it's always available under non-Unix systems with the
+ exception of Palm OS, this does seem to be the case for now. And
+ under Unix we trust configure to detect it (except for SGI special
+ case above).
+ */
+ #if defined(HAVE_WCSFTIME) || \
+ !(defined(__UNIX__) || defined(__WXPALMOS__))
+ #define wxCRT_StrftimeW wcsftime
+ #endif /* ! __WXPALMOS__ */
+#endif
#ifndef wxCRT_StrftimeW
WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
projects / wxWidgets.git / blobdiff