X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2fc40b4786f7ae8c255ce1184441bd94d9554a0..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/wxcrtbase.h?ds=sidebyside

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index ca195b2806..bf28f4cade 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__)
@@ -179,7 +183,9 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #elif !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__)
     #define wxCRT_StrdupA strdup
 #endif
-#if defined(__WINDOWS__)
+
+// all compilers except Cygwin provide _wcsdup() under Windows
+#if defined(__WINDOWS__) && !defined(__CYGWIN__)
     #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(__SALFORDC__) || 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__)
+    #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
+    #ifdef HAVE_WCSNCASECMP
+        #define wxCRT_StrnicmpW wcsncasecmp
     #endif
-#endif /* !defined(wxCRT_StricmpA) */
-/* FIXME-UTF8: use wcs(n)casecmp if available for *W versions */
+/* #else -- use wxWidgets implementation */
+#endif
 
 #ifdef HAVE_STRTOK_R
     #define  wxCRT_StrtokA(str, sep, last)    strtok_r(str, sep, last)
@@ -594,8 +628,10 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
    ------------------------------------------------------------------------- */
 
 #define wxCRT_StrftimeA  strftime
+#ifndef __WXPALMOS__
 /* FIXME-UTF8: when is this available? */
 #define wxCRT_StrftimeW  wcsftime
+#endif /* ! __WXPALMOS__ */
 
 #ifndef wxCRT_StrftimeW
 WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
@@ -662,12 +698,24 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
 /* safe version of strlen() (returns 0 if passed NULL pointer) */
 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
+       WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s );
+#endif
+#ifndef wxWCHAR_T_IS_WXCHAR32
+       WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s );
+#endif
 #define wxWcslen wxCRT_StrlenW
 
 #define wxStrdupA wxCRT_StrdupA
 #define wxStrdupW wxCRT_StrdupW
 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
+       WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s);
+#endif
+#ifndef wxWCHAR_T_IS_WXCHAR32
+       WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s);
+#endif
 
 #endif /* __cplusplus */