AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes after removal of palmos/gccpriv.h.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-01-19 06:48:42 +00:00
parent b1d22ded8d
commit a0be690852
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/platform.h
View File

@ -508,6 +508,12 @@
# include "wx/msw/wince/libraries.h" # include "wx/msw/wince/libraries.h"
#endif #endif
/* Force inclusion of main PalmOS header: */
#ifdef __WXPALMOS__
# include <PalmOS.h>
# undef Abs
#endif
/* /*
This macro can be used to test the gcc version and can be used like this: This macro can be used to test the gcc version and can be used like this:
@ -526,12 +532,14 @@
This macro can be used to check that the version of mingw32 compiler is This macro can be used to check that the version of mingw32 compiler is
at least maj.min at least maj.min
*/ */
#if defined(__WXPALMOS__) #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
# include "wx/palmos/gccpriv.h"
#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
defined( __CYGWIN__ ) || \ defined( __CYGWIN__ ) || \
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
!defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) !defined(__DOS__) && \
!defined(__WXMOTIF__) && \
!defined(__WXGTK__) && \
!defined(__WXX11__) && \
!defined(__WXPALMOS__)
# include "wx/msw/gccpriv.h" # include "wx/msw/gccpriv.h"
#else #else
# undef wxCHECK_W32API_VERSION # undef wxCHECK_W32API_VERSION

3
include/wx/string.h
View File

@ -132,7 +132,8 @@ inline int Stricmp(const char *psz1, const char *psz2)
return stricmp(psz1, psz2); return stricmp(psz1, psz2);
#elif defined(__WXPM__) #elif defined(__WXPM__)
return stricmp(psz1, psz2); return stricmp(psz1, psz2);
#elif defined(HAVE_STRCASECMP_IN_STRING_H) || \ #elif defined(__WXPALMOS__) || \
defined(HAVE_STRCASECMP_IN_STRING_H) || \
defined(HAVE_STRCASECMP_IN_STRINGS_H) || \ defined(HAVE_STRCASECMP_IN_STRINGS_H) || \
defined(__GNUWIN32__) defined(__GNUWIN32__)
return strcasecmp(psz1, psz2); return strcasecmp(psz1, psz2);