Update msw files to use the new definitions

[wxWidgets.git] / include / wx / wxcrtbase.h

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index f683ab479d637d9fa74387baa961439fb5b0f238..bda4ef85727db00b8bbea114269ef18f86faf853 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -198,7 +198,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
     #define wxCRT_StrdupA strdup
 #endif
 
     #define wxCRT_StrdupA strdup
 #endif
 

-// most Windows compilers provide _wcsdup()
+/* most Windows compilers provide _wcsdup() */

 #if defined(__WINDOWS__) && \
         !(defined(__CYGWIN__) || defined(__WX_STRICT_ANSI_GCC__))
     #define wxCRT_StrdupW _wcsdup
 #if defined(__WINDOWS__) && \
         !(defined(__CYGWIN__) || defined(__WX_STRICT_ANSI_GCC__))
     #define wxCRT_StrdupW _wcsdup


@@ -449,7 +449,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
                                                        wchar_t** endptr,
                                                        int base);
     #endif
                                                        wchar_t** endptr,
                                                        int base);
     #endif

-#endif // wxLongLong_t
+#endif /* wxLongLong_t */

 
 
 /* -------------------------------------------------------------------------
 
 
 /* -------------------------------------------------------------------------


@@ -621,7 +621,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
 #endif
 
 #ifdef __DARWIN__
 #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 wxNEED_WX_MBSTOWCS
     #endif
 #endif


@@ -657,12 +657,21 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
         probably be simpler to just always use our own wxCRT_StrftimeW() below
         if it does ever become a problem).
      */
         probably be simpler to just always use our own wxCRT_StrftimeW() below
         if it does ever become a problem).
      */

-    extern "C" size_t
+#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
     _xpg5_wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm * );
     #define wxCRT_StrftimeW _xpg5_wcsftime
 #else

-    #ifndef __WXPALMOS__
-        // assume it's always available, this does seem to be the case for now
+    /*
+        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
         #define wxCRT_StrftimeW  wcsftime
     #endif /* ! __WXPALMOS__ */
 #endif