AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mingw32 compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-04-09 15:37:24 +00:00
parent d9b9876f6e
commit 068cfb66c2
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/defs.h
View File

@ -168,7 +168,10 @@
#endif // HP-UX
#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
#include "wx/msw/gccpriv.h"
#include "wx/msw/gccpriv.h"
#else
#undef wxCHECK_W32API_VERSION
#define wxCHECK_W32API_VERSION(maj, min) (0)
#endif
//////////////////////////////////////////////////////////////////////////////////

36
include/wx/msw/gccpriv.h Normal file
View File

@ -0,0 +1,36 @@
// MinGW w32api specific stuff
#ifndef _WX_MSW_GCCPRIV_H_
#define _WX_MSW_GCCPRIV_H_
// check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
#if defined( HAVE_W32API_H )
#include <w32api.h>
#endif
#define wxCHECK_W32API_VERSION( major, minor ) \
( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
&& ( ( __W32API_MAJOR_VERSION > (major) ) \
|| ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) )
// 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__
#endif
#endif
// _WX_MSW_GCCPRIV_H_

3
src/jpeg/jmorecfg.h
View File

@ -157,6 +157,9 @@ typedef short INT16;
#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
#include <wx/msw/gccpriv.h>
#else
#undef wxCHECK_W32API_VERSION
#define wxCHECK_W32API_VERSION(maj, min) (0)
#endif
/* INT32 must hold at least signed 32-bit values. */