From e433504316adbf73756f7f5e2e79564b1659ab98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 5 Jul 2003 15:35:32 +0000 Subject: [PATCH] workaround a Watcom build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/gccpriv.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h index b2150285f6..6b96900f33 100644 --- a/include/wx/msw/gccpriv.h +++ b/include/wx/msw/gccpriv.h @@ -30,10 +30,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 +63,6 @@ #define __CYGWIN10__ #endif -#ifndef __WATCOMC__ /* this workarounds a bug in Watcom's parser */ /* 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,7 +89,6 @@ #endif #endif #endif -#endif /* __WATCOMC__ */ #endif