PalmOS 6 compilation fixes (patch 1849757)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,11 +28,17 @@
|
||||
include this one!
|
||||
*/
|
||||
|
||||
#if !defined(__WXPALMOS5__)
|
||||
#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>
|
||||
#endif
|
||||
|
||||
#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 */
|
||||
#ifndef __WXWINCE__
|
||||
#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
|
||||
#define wxCRT_StrcollA strcoll
|
||||
#define wxCRT_StrxfrmA strxfrm
|
||||
|
||||
@@ -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
|
||||
#define wxCRT_StrnicmpA strnicmp
|
||||
#define wxCRT_StrnicmpA StrNCaselessCompare
|
||||
#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
|
||||
------------------------------------------------------------------------- */
|
||||
|
||||
#if defined(__UNIX__) || defined(__WXMAC__)
|
||||
#if defined(__UNIX__) || defined(__WXMAC__) || defined(__WXPALMOS__)
|
||||
#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(__WXPALMOS__)
|
||||
#define wxNEED_WX_MBSTOWCS
|
||||
#endif
|
||||
|
||||
#ifdef __DARWIN__
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
|
||||
|
Reference in New Issue
Block a user