Move wxCHECK_MINGW32_VERSION() declaration to wx/msw/gccpriv.h.
Unfortunately we can't keep it in wx/compiler.h which is included too early, before UNICODE macro is defined, and we can't define it before including wx/setup.h which itself must be included after wx/compiler.h. So move it to wx/msw/gccpriv.h which is not a great solution, as the best would be to get rid of this gcc-specific file completely, but at least should make everything build again and ensure that _mingw.h is included after UNICODE definition. Closes #15805. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -139,15 +139,11 @@
|
||||
maj.min
|
||||
*/
|
||||
|
||||
/* Check for Mingw runtime version: */
|
||||
/*
|
||||
Define Mingw identification symbols, wxCHECK_MINGW32_VERSION() is defined in
|
||||
wx/msw/gccpriv.h which is included later, see comments there.
|
||||
*/
|
||||
#ifdef __MINGW32__
|
||||
/* Include the header defining __MINGW32_{MAJ,MIN}OR_VERSION */
|
||||
#include <_mingw.h>
|
||||
|
||||
#define wxCHECK_MINGW32_VERSION( major, minor ) \
|
||||
( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
|
||||
|| ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
|
||||
|
||||
/*
|
||||
MinGW-w64 project provides compilers for both Win32 and Win64 but only
|
||||
defines the same __MINGW32__ symbol for the former as MinGW32 toolchain
|
||||
@@ -169,8 +165,6 @@
|
||||
# define __MINGW32_TOOLCHAIN__
|
||||
# endif
|
||||
# endif
|
||||
#else
|
||||
#define wxCHECK_MINGW32_VERSION( major, minor ) (0)
|
||||
#endif
|
||||
|
||||
#endif // _WX_COMPILER_H_
|
||||
|
Reference in New Issue
Block a user