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

workaround a Watcom build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-05 15:35:32 +00:00
parent 344ca5315d
commit e433504316
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,10 +30,14 @@
#include <w32api.h> #include <w32api.h>
#endif #endif
#define wxCHECK_W32API_VERSION( major, minor ) \ /* Watcom can't handle defined(xxx) here: */
( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ #if defined(__W32API_MAJOR_VERSION) && defined(__W32API_MINOR_VERSION)
&& ( ( __W32API_MAJOR_VERSION > (major) ) \ #define wxCHECK_W32API_VERSION( major, minor ) \
( ( ( __W32API_MAJOR_VERSION > (major) ) \
|| ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) ) || ( __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 /* Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
are more ms-like (header author is Anders Norlander, hence the name) */ are more ms-like (header author is Anders Norlander, hence the name) */
@ -59,7 +63,6 @@
#define __CYGWIN10__ #define __CYGWIN10__
#endif #endif
#ifndef __WATCOMC__ /* this workarounds a bug in Watcom's parser */
/* 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 ) \
@ -86,7 +89,6 @@
#endif #endif
#endif #endif
#endif #endif
#endif /* __WATCOMC__ */
#endif #endif