From ce20b5d72190e3f2544891b325dcf66ff1946386 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 10 Apr 2001 20:38:44 +0000 Subject: [PATCH] more fixes for mingw32 compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/jpeg/jmorecfg.h | 2 +- src/msw/dialup.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h index 8fbd19c903..2d86049094 100644 --- a/src/jpeg/jmorecfg.h +++ b/src/jpeg/jmorecfg.h @@ -172,7 +172,7 @@ typedef short INT16; #elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \ wxCHECK_W32API_VERSION( 0, 5 ) || \ ((defined(__MINGW32__) || defined(__CYGWIN__)) \ - && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))) + && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>95)))) /* INT32 is defined in windows.h for these compilers */ #define INT32_DEFINED diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 8db47bdd84..8e01b68a87 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -57,11 +57,10 @@ DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED) // Doesn't yet compile under VC++ 4, BC++, Watcom C++: no wininet.h #if !defined(__BORLANDC__) && \ + (!defined(__GNUWIN32__) || wxCHECK_W32API_VERSION(0, 5)) && \ !defined(__GNUWIN32_OLD__) && \ !defined(__WATCOMC__) && \ (!defined(__VISUALC__) || (__VISUALC__ >= 1020)) - // FIXME: add this back as soon as wxCHECK_W32API_VERSION is chcked in - // (!defined(__GNUWIN32__) || wxCHECK_W32API_VERSION(0, 5)) && \ #include #include -- 2.45.2