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 6c2ceecbb546efab826f05b96bb531b9947450dc..601f6d2ce0a231cc07cc98e7750fffee6b7dd75c 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -180,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.
 
@@ -209,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
@@ -325,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__)
@@ -467,6 +476,14 @@
 #    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"