Move wx/msw/gccpriv.h inclusion back to wx/platform.h from wx/compiler.h.
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:
@@ -445,6 +445,20 @@
|
||||
#define wxNEEDS_CHARPP
|
||||
#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-
|
||||
specific case since no sane compiler should be defining either
|
||||
|
Reference in New Issue
Block a user