X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/344ca5315dfb3d8051340e78c9bc57aa454497f2..4ed85025f3ba537206f70f3dd10466e16da926d4:/include/wx/msw/gccpriv.h?ds=inline diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h index b2150285f6..b449670d94 100644 --- a/include/wx/msw/gccpriv.h +++ b/include/wx/msw/gccpriv.h @@ -1,5 +1,15 @@ +/* + Name: wx/msw/gccpriv.h + Purpose: MinGW/Cygwin definitions + Author: Vadim Zeitlin + Modified by: + Created: + RCS-ID: $Id$ + Copyright: (c) Vadim Zeitlin + Licence: wxWindows Licence +*/ + /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ -/* MinGW w32api specific stuff */ #ifndef _WX_MSW_GCCPRIV_H_ #define _WX_MSW_GCCPRIV_H_ @@ -8,20 +18,21 @@ #define __GNUWIN32__ #endif +#if defined(__MINGW32__) && ( ( __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 ) + #if ( __GNUC__ > 2 ) #define HAVE_W32API_H #endif #endif -#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__) +#if wxCHECK_WATCOM_VERSION(1,0) #define HAVE_W32API_H #endif @@ -30,10 +41,14 @@ #include #endif -#define wxCHECK_W32API_VERSION( major, minor ) \ - ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ - && ( ( __W32API_MAJOR_VERSION > (major) ) \ +/* Watcom can't handle defined(xxx) here: */ +#if defined(__W32API_MAJOR_VERSION) && defined(__W32API_MINOR_VERSION) + #define wxCHECK_W32API_VERSION( major, minor ) \ + ( ( ( __W32API_MAJOR_VERSION > (major) ) \ || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) ) +#else + #define wxCHECK_W32API_VERSION( major, minor ) (0) +#endif /* Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which are more ms-like (header author is Anders Norlander, hence the name) */ @@ -59,7 +74,15 @@ #define __CYGWIN10__ #endif -#ifndef __WATCOMC__ /* this workarounds a bug in Watcom's parser */ +/* 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 ) \ @@ -86,8 +109,19 @@ #endif #endif #endif -#endif /* __WATCOMC__ */ +/* 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 + #define _puttchar puttchar + #endif +#endif #endif /* _WX_MSW_GCCPRIV_H_ */