applied patch 411059 (mingw win32 api version check)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -165,23 +165,8 @@
|
||||
#define va_list __gnuc_va_list
|
||||
#endif // HP-UX
|
||||
|
||||
// Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
|
||||
// are more ms-like (header author is Anders Norlander, hence the name)
|
||||
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
#define wxUSE_NORLANDER_HEADERS 1
|
||||
#endif
|
||||
#else
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
#define wxUSE_NORLANDER_HEADERS 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// "old" GNUWIN32 is the one without Norlander's headers: it lacks the
|
||||
// standard Win32 headers and we define the used stuff ourselves for it
|
||||
// in wx/msw/gnuwin32/extra.h
|
||||
#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS
|
||||
#define __GNUWIN32_OLD__
|
||||
#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
|
||||
#include "wx/msw/gccpriv.h"
|
||||
#endif
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
|
Reference in New Issue
Block a user