From 573e6c9041f5e1955aebd61a0b7d9d5b44804e2c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 8 Apr 2001 23:53:12 +0000 Subject: [PATCH] applied patch 411059 (mingw win32 api version check) This is partial cherry-pick of d8c72298ec07a4f296ffde211360682447b9d159 from the main repository. --- jmorecfg.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jmorecfg.h b/jmorecfg.h index f244c26..1de9b7d 100644 --- a/jmorecfg.h +++ b/jmorecfg.h @@ -155,6 +155,10 @@ typedef unsigned int UINT16; typedef short INT16; #endif +#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ ) +#include +#endif + /* INT32 must hold at least signed 32-bit values. */ /* you may define INT32_DEFINED if it is already defined somewhere */ @@ -163,8 +167,10 @@ typedef short INT16; /* X11/xmd.h correctly defines INT32 */ #define INT32_DEFINED #elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \ + wxCHECK_W32API_VERSION( 0, 5 ) || \ ((defined(__MINGW32__) || defined(__CYGWIN__)) \ && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))) + /* INT32 is defined in windows.h for these compilers */ #define INT32_DEFINED #include