X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08848c9f95a940f3aec463111f759812a8dc7086..eaefbb887c448d837b97857a097426e591bbc1d0:/include/wx/msw/gccpriv.h diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h index a7ec8e86a6..20dc5c11d1 100644 --- a/include/wx/msw/gccpriv.h +++ b/include/wx/msw/gccpriv.h @@ -16,12 +16,12 @@ #endif #endif #elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H ) - #if ( __GNUC__ > 2 ) + #if ( __GNUC__ > 2 ) #define HAVE_W32API_H #endif #endif -#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200) +#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200) #define HAVE_W32API_H #endif @@ -63,6 +63,15 @@ #define __CYGWIN10__ #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, so let's define them ourselves: */ #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \ @@ -90,9 +99,11 @@ #endif #endif -// current mingw32 headers forget to define _puttchar, this will probably be -// fixed in the next versions but for now do it ourselves -#if defined( __MINGW32__ ) && !defined( _puttchar ) +// current (= before mingw-runtime 3.3) mingw32 headers forget to +// define _puttchar, this will probably be fixed in the next versions but +// for now do it ourselves +#if defined( __MINGW32__ ) && \ + !wxCHECK_MINGW32_VERSION(3,3) && !defined( _puttchar ) #ifdef wxUSE_UNICODE #define _puttchar putwchar #else @@ -100,6 +111,5 @@ #endif #endif - #endif /* _WX_MSW_GCCPRIV_H_ */