Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wx/msw/gccpriv.h inclusion back to wx/platform.h from wx/compiler.h.

Browse Source 
Do keep compiler-specific wxCHECK_MINGW32_VERSION() in wx/compiler.h as it's
needed by wx/cpp.h which includes wx/compiler.h only. But put the rest of the
stuff in gccpriv.h in its old place as including it before wx/setup.h didn't
work correctly and was unnecessary anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-13 23:23:14 +00:00
parent b8d8362ca0
commit e87d78bb36
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/compiler.h
View File

@@ -132,21 +132,14 @@
This macro can be used to check that the version of mingw32 compiler is This macro can be used to check that the version of mingw32 compiler is
at least maj.min at least maj.min
*/ */
#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ /* Check for Mingw runtime version: */
wxCHECK_WATCOM_VERSION(1,0) ) && \ #if defined(__MINGW32_MAJOR_VERSION) && defined(__MINGW32_MINOR_VERSION)
!defined(__DOS__) && \ #define wxCHECK_MINGW32_VERSION( major, minor ) \
!defined(__WXPM__) && \ ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
!defined(__WXMOTIF__) && \ || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
!defined(__WXX11__)
# include "wx/msw/gccpriv.h"
#else #else
# undef wxCHECK_W32API_VERSION #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
# define wxCHECK_W32API_VERSION(maj, min) (0)
# undef wxCHECK_MINGW32_VERSION
# define wxCHECK_MINGW32_VERSION(maj, min) (0)
#endif #endif
#endif // _WX_COMPILER_H_ #endif // _WX_COMPILER_H_

9
include/wx/msw/gccpriv.h
View File

@@ -74,15 +74,6 @@
#define __CYGWIN10__ #define __CYGWIN10__
#endif #endif
/* Check for Mingw runtime version: */
#if defined(__MINGW32_MAJOR_VERSION) && defined(__MINGW32_MINOR_VERSION)
#define wxCHECK_MINGW32_VERSION( major, minor ) \
( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
|| ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
#else
#define wxCHECK_MINGW32_VERSION( major, minor ) (0)
#endif
/* Mingw runtime 1.0-20010604 has some missing _tXXXX functions, /* Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
so let's define them ourselves: */ so let's define them ourselves: */
#if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \ #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \

14
include/wx/platform.h
View File

@@ -445,6 +445,20 @@
#define wxNEEDS_CHARPP #define wxNEEDS_CHARPP
#endif #endif
#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
wxCHECK_WATCOM_VERSION(1,0) ) && \
!defined(__DOS__) && \
!defined(__WXPM__) && \
!defined(__WXMOTIF__) && \
!defined(__WXX11__)
# include "wx/msw/gccpriv.h"
#else
# undef wxCHECK_W32API_VERSION
# define wxCHECK_W32API_VERSION(maj, min) (0)
#endif
/* /*
Handle Darwin gcc universal compilation. Don't do this in an Apple- Handle Darwin gcc universal compilation. Don't do this in an Apple-
specific case since no sane compiler should be defining either specific case since no sane compiler should be defining either