Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't define _puttchar ourselves when using newest mingw runtime

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-05 21:39:35 +00:00
parent f8ab089a49
commit 01ac0f138b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/msw/gccpriv.h
View File

@@ -63,6 +63,15 @@
#define __CYGWIN10__ #define __CYGWIN10__
#endif #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, /* Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
so let's define them ourselves: */ so let's define them ourselves: */
#if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \ #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \
@@ -90,9 +99,11 @@
#endif #endif
#endif #endif
// current mingw32 headers forget to define _puttchar, this will probably be // current (= before mingw-runtime 3.3) mingw32 headers forget to
// fixed in the next versions but for now do it ourselves // define _puttchar, this will probably be fixed in the next versions but
#if defined( __MINGW32__ ) && !defined( _puttchar ) // for now do it ourselves
#if defined( __MINGW32__ ) && \
!wxCHECK_MINGW32_VERSION(3,3) && !defined( _puttchar )
#ifdef wxUSE_UNICODE #ifdef wxUSE_UNICODE
#define _puttchar putwchar #define _puttchar putwchar
#else #else
@@ -100,6 +111,5 @@
#endif #endif
#endif #endif
#endif #endif
/* _WX_MSW_GCCPRIV_H_ */ /* _WX_MSW_GCCPRIV_H_ */