From 01ac0f138bbd3d9e51b83a26ef192e50219a2c0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 5 Jun 2004 21:39:35 +0000 Subject: [PATCH] don't define _puttchar ourselves when using newest mingw runtime git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/gccpriv.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h index a7ec8e86a6..c08747990d 100644 --- a/include/wx/msw/gccpriv.h +++ b/include/wx/msw/gccpriv.h @@ -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_ */ -- 2.50.0