more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6bb277a2bf538f911a7ca66a542070957b84a4fc..601f6d2ce0a231cc07cc98e7750fffee6b7dd75c 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -19,7 +19,7 @@
     Codewarrior doesn't define any Windows symbols until some headers
     are included
 */
-#if __MWERKS__
+#ifdef __MWERKS__
 #    include <stddef.h>
 #endif
 
@@ -57,9 +57,7 @@
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
-#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
-    && !defined(__WXX11__)
-    /* for Cygwin, default to wxMSW unless otherwise specified */
+#if defined(__CYGWIN__) && defined(__WINDOWS__)
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
@@ -182,6 +180,15 @@
 #   endif
 #endif
 
+/*
+   Include wx/setup.h for the Unix platform defines generated by configure and
+   the library compilation options
+
+   Note that it must be included before defining hardware symbols below as they
+   could be already defined by configure
+ */
+#include "wx/setup.h"
+
 /*
    Hardware platform detection.
 
@@ -211,11 +218,6 @@
     #endif
 #endif /* alpha */
 
-/*
-   Include wx/setup.h for the Unix platform defines generated by configure and
-   the library compilation options
- */
-#include "wx/setup.h"
 
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
@@ -327,6 +329,11 @@
              */
 #            define __SGI_CC__
 #        endif /* gcc/!gcc */
+
+        /* system headers use this symbol and not __cplusplus in some places */
+#       ifndef _LANGUAGE_C_PLUS_PLUS
+#           define _LANGUAGE_C_PLUS_PLUS
+#       endif
 #    endif  /* SGI */
 
 #    if defined(sun) || defined(__SUN__)
@@ -469,17 +476,19 @@
 #    endif
 #endif
 
+/*
+   We get "Large Files (ILP32) not supported in strict ANSI mode." #error
+   from HP-UX standard headers when compiling with g++ without this:
+ */
+#if defined(__HPUX__) && !defined(__STDC_EXT__)
+#   define __STDC_EXT__ 1
+#endif
+
 /* Force linking against required libraries under Windows CE: */
 #ifdef __WXWINCE__
 #   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:
 
@@ -499,9 +508,10 @@
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
-    defined( __CYGWIN__ ) || \
+    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && \
+    !defined(__WXOS2__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \
@@ -568,4 +578,3 @@
 #endif
 
 #endif /* _WX_PLATFORM_H_ */
-