X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20bc5ad8dd419d0d3e524079f8fdbe3d8c14231f..259c43f679ca655362b5a439e11c87fc0666d663:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index d3f6c0c53e..601f6d2ce0 100644 --- 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 #endif @@ -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" @@ -494,6 +511,7 @@ ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ !defined(__DOS__) && \ + !defined(__WXOS2__) && \ !defined(__WXMOTIF__) && \ !defined(__WXGTK__) && \ !defined(__WXX11__) && \ @@ -560,4 +578,3 @@ #endif #endif /* _WX_PLATFORM_H_ */ -