more fixes for mingw32 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
0c96db12c4
commit
ce20b5d721
@ -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
|
||||
|
@ -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 <ras.h>
|
||||
#include <raserror.h>
|
||||
|
Loading…
Reference in New Issue
Block a user