From a0be6908526c8030fc8649b5d0a42c49ce4585ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Wed, 19 Jan 2005 06:48:42 +0000
Subject: [PATCH] Fixes after removal of palmos/gccpriv.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/platform.h | 16 ++++++++++++----
 include/wx/string.h   |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7d82a9cef5..a7a9921378 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -508,6 +508,12 @@
 #   include "wx/msw/wince/libraries.h"
 #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:
 
@@ -526,12 +532,14 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined(__WXPALMOS__)
-#    include "wx/palmos/gccpriv.h"
-#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
       (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"
 #else
 #    undef wxCHECK_W32API_VERSION
diff --git a/include/wx/string.h b/include/wx/string.h
index a2c14c11fb..4162fe4fc8 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -132,7 +132,8 @@ inline int Stricmp(const char *psz1, const char *psz2)
   return stricmp(psz1, psz2);
 #elif defined(__WXPM__)
   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(__GNUWIN32__)
   return strcasecmp(psz1, psz2);
-- 
2.45.2