X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/498919ddcd514f3f3a153357a852065a11bd8585..97c58531bf6912d5b6214b4bd6298466ebcb87ca:/include/wx/platform.h?ds=sidebyside

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6c2ceecbb5..545e5f7a56 100644
--- 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__)
@@ -389,14 +398,19 @@
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
+
+    /* wxOS2 vs. non wxOS2 ports on OS2 platform */
+#    ifndef __WXMOTIF__
+#        ifndef __WXOS2__
+#            define __WXOS2__
+#        endif
+#        ifndef __WXPM__
+#            define __WXPM__
+#        endif
+#    endif
+
 #    if defined(__IBMCPP__)
 #        define __VISAGEAVER__ __IBMCPP__
-#    endif
-#    ifndef __WXOS2__
-#        define __WXOS2__
-#    endif
-#    ifndef __WXPM__
-#        define __WXPM__
 #    endif
 
     /* Place other OS/2 compiler environment defines here */
@@ -467,6 +481,18 @@
 #    endif
 #endif
 
+#ifdef __INTEL_COMPILER
+#   define __INTELC__
+#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"