cheng/libjpeg-turbo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch 411059 (mingw win32 api version check)

Browse Source 
This is partial cherry-pick of d8c72298ec07a4f296ffde211360682447b9d159
from the main repository.
This commit is contained in:
Vadim Zeitlin 2001-04-08 23:53:12 +00:00 committed by Vadim Zeitlin
parent 2f647e587d
commit 573e6c9041
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jmorecfg.h
View File

@ -155,6 +155,10 @@ typedef unsigned int UINT16;
typedef short INT16; typedef short INT16;
#endif #endif
#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
#include <wx/msw/gccpriv.h>
#endif
/* INT32 must hold at least signed 32-bit values. */ /* INT32 must hold at least signed 32-bit values. */
/* you may define INT32_DEFINED if it is already defined somewhere */ /* you may define INT32_DEFINED if it is already defined somewhere */
@ -163,8 +167,10 @@ typedef short INT16;
/* X11/xmd.h correctly defines INT32 */ /* X11/xmd.h correctly defines INT32 */
#define INT32_DEFINED #define INT32_DEFINED
#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \ #elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
wxCHECK_W32API_VERSION( 0, 5 ) || \
((defined(__MINGW32__) || defined(__CYGWIN__)) \ ((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 */ /* INT32 is defined in windows.h for these compilers */
#define INT32_DEFINED #define INT32_DEFINED
#include <windows.h> #include <windows.h>