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

define wxCHECK_W32API_VERSION for OpenWatcom and DigitalMars

Browse Source 
compilers because both of them use w32api


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-05 14:50:26 +00:00
parent 149cc21856
commit ac776ec973
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
// MinGW w32api specific stuff /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
/* MinGW w32api specific stuff */
#ifndef _WX_MSW_GCCPRIV_H_ #ifndef _WX_MSW_GCCPRIV_H_
#define _WX_MSW_GCCPRIV_H_ #define _WX_MSW_GCCPRIV_H_
@@ -20,7 +21,11 @@
#endif #endif
#endif #endif
// check for MinGW/Cygwin w32api version ( releases >= 0.5, only ) #if (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__)
#define HAVE_W32API_H
#endif
/* check for MinGW/Cygwin w32api version ( releases >= 0.5, only ) */
#if defined( HAVE_W32API_H ) #if defined( HAVE_W32API_H )
#include <w32api.h> #include <w32api.h>
#endif #endif
@@ -30,8 +35,8 @@
&& ( ( __W32API_MAJOR_VERSION > (major) ) \ && ( ( __W32API_MAJOR_VERSION > (major) ) \
|| ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) ) || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) )
// 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) */
#if (defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95))) #if (defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))
#ifndef wxUSE_NORLANDER_HEADERS #ifndef wxUSE_NORLANDER_HEADERS
#define wxUSE_NORLANDER_HEADERS 1 #define wxUSE_NORLANDER_HEADERS 1
@@ -42,20 +47,20 @@
#endif #endif
#endif #endif
// "old" GNUWIN32 is the one without Norlander's headers: it lacks the /* "old" GNUWIN32 is the one without Norlander's headers: it lacks the
// standard Win32 headers and we define the used stuff ourselves for it standard Win32 headers and we define the used stuff ourselves for it
// in wx/msw/gnuwin32/extra.h in wx/msw/gnuwin32/extra.h */
#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS #if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS
#define __GNUWIN32_OLD__ #define __GNUWIN32_OLD__
#endif #endif
// Cygwin 1.0 /* Cygwin 1.0 */
#if defined(__CYGWIN__) && ((__GNUC__==2) && (__GNUC_MINOR__==9)) #if defined(__CYGWIN__) && ((__GNUC__==2) && (__GNUC_MINOR__==9))
#define __CYGWIN10__ #define __CYGWIN10__
#endif #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 ) \
&& !wxCHECK_W32API_VERSION( 1, 1 ) && !wxCHECK_W32API_VERSION( 1, 1 )
#ifndef _tsetlocale #ifndef _tsetlocale
@@ -83,4 +88,4 @@
#endif #endif
// _WX_MSW_GCCPRIV_H_ /* _WX_MSW_GCCPRIV_H_ */

4
include/wx/platform.h
View File

@@ -298,7 +298,9 @@
This macro can be used to check that the version of mingw32 compiler is This macro can be used to check that the version of mingw32 compiler is
at least maj.min at least maj.min
*/ */
#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ ) #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
defined( __CYGWIN__ ) || \
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__)
#include "wx/msw/gccpriv.h" #include "wx/msw/gccpriv.h"
#else #else
#undef wxCHECK_W32API_VERSION #undef wxCHECK_W32API_VERSION