Compilation fix for gcc-4 and newer.

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

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 476fb654e7d264d1ff6a97e789d6f1253829e25c..0f5f16d2e71e09f9cfdc170c65d72603fcca2124 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -2,7 +2,7 @@
  * Name:        wx/wxcrtbase.h
  * Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
  *              CRT functions
  * Name:        wx/wxcrtbase.h
  * Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
  *              CRT functions

- * Author:      Joel Farley, Ove K�ven
+ * Author:      Joel Farley, Ove Kaaven

  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$


@@ -28,11 +28,17 @@
         include this one!
  */
 
         include this one!
  */
 

+#if !defined(__WXPALMOS5__)

 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>

-#include <wctype.h>
+#if defined(__WXPALMOS__)
+    #include <wchar.h>
+#else
+    #include <wctype.h>
+#endif

 #include <time.h>
 #include <time.h>

+#endif

 
 #if defined(__WINDOWS__) && !defined(__WXWINCE__)
     #include <io.h>
 
 #if defined(__WINDOWS__) && !defined(__WXWINCE__)
     #include <io.h>


@@ -157,7 +163,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #define wxCRT_StrstrW    wcsstr
 
 /* these functions are not defined under CE, at least in VC8 CRT */
 #define wxCRT_StrstrW    wcsstr
 
 /* these functions are not defined under CE, at least in VC8 CRT */

-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)

     #define wxCRT_StrcollA   strcoll
     #define wxCRT_StrxfrmA   strxfrm
 
     #define wxCRT_StrcollA   strcoll
     #define wxCRT_StrxfrmA   strxfrm
 


@@ -223,7 +229,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
  * versions */
 #if !defined(wxCRT_StricmpA)
     #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
  * versions */
 #if !defined(wxCRT_StricmpA)
     #if defined(__BORLANDC__) || defined(__WATCOMC__) || \

-            defined(__SALFORDC__) || defined(__VISAGECPP__) || \
+            defined(__VISAGECPP__) || \

             defined(__EMX__) || defined(__DJGPP__)
         #define wxCRT_StricmpA stricmp
         #define wxCRT_StrnicmpA strnicmp
             defined(__EMX__) || defined(__DJGPP__)
         #define wxCRT_StricmpA stricmp
         #define wxCRT_StrnicmpA strnicmp


@@ -232,7 +238,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
          * quick hack should do until one can be written.
          */
         #define wxCRT_StricmpA StrCaselessCompare
          * quick hack should do until one can be written.
          */
         #define wxCRT_StricmpA StrCaselessCompare

-        #define wxCRT_StrnicmpA strnicmp
+        #define wxCRT_StrnicmpA StrNCaselessCompare

     #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
             (defined(__MWERKS__) && defined(__INTEL__))
         #define wxCRT_StricmpA _stricmp
     #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
             (defined(__MWERKS__) && defined(__INTEL__))
         #define wxCRT_StricmpA _stricmp


@@ -401,7 +407,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
                                   stdio.h
    ------------------------------------------------------------------------- */
 
                                   stdio.h
    ------------------------------------------------------------------------- */
 

-#if defined(__UNIX__) || defined(__WXMAC__)
+#if defined(__UNIX__) || defined(__WXMAC__) || defined(__WXPALMOS__)

     #define wxMBFILES 1
 #else
     #define wxMBFILES 0
     #define wxMBFILES 1
 #else
     #define wxMBFILES 0


@@ -561,6 +567,9 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
 #if defined(__MWERKS__) && defined(__MSL__)
     #define wxNEED_WX_MBSTOWCS
 #endif
 #if defined(__MWERKS__) && defined(__MSL__)
     #define wxNEED_WX_MBSTOWCS
 #endif

+#if defined(__WXPALMOS__)
+    #define wxNEED_WX_MBSTOWCS
+#endif

 
 #ifdef __DARWIN__
     #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
 
 #ifdef __DARWIN__
     #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2


@@ -585,8 +594,10 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
    ------------------------------------------------------------------------- */
 
 #define wxCRT_StrftimeA  strftime
    ------------------------------------------------------------------------- */
 
 #define wxCRT_StrftimeA  strftime

+#ifndef __WXPALMOS__

 /* FIXME-UTF8: when is this available? */
 #define wxCRT_StrftimeW  wcsftime
 /* 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,
 
 #ifndef wxCRT_StrftimeW
 WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,


@@ -653,12 +664,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; }
 /* 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); }
 #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 */
 
 
 #endif /* __cplusplus */