From d69f2e34caebbe1b265814c9de60d7b41a06d561 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 17 May 2005 18:20:24 +0000 Subject: [PATCH] Fix for MinGW macros not available due to include order (http://www.solidsteel.nl/users/wxwidgets/viewtopic.php?t=108) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/gccpriv.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h index 52428c4624..e90318cf08 100644 --- a/include/wx/msw/gccpriv.h +++ b/include/wx/msw/gccpriv.h @@ -18,12 +18,13 @@ #define __GNUWIN32__ #endif +#if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) ) + #include <_mingw.h> +#endif + #if defined( __MINGW32__ ) && !defined(__WINE__) && !defined( HAVE_W32API_H ) - #if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) ) - #include <_mingw.h> - #if __MINGW32_MAJOR_VERSION >= 1 - #define HAVE_W32API_H - #endif + #if __MINGW32_MAJOR_VERSION >= 1 + #define HAVE_W32API_H #endif #elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H ) #if ( __GNUC__ > 2 ) -- 2.45.2