Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed (?) mingw32/cygwin compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-02-06 00:53:56 +00:00
parent 918a745c19
commit ae128b358e
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/jpeg/jmorecfg.h
View File

@@ -157,15 +157,25 @@ typedef short INT16;
/* INT32 must hold at least signed 32-bit values. */ /* INT32 must hold at least signed 32-bit values. */
/* Modified JACS 23/4/99. 1200 means VC++ 6 */ /* you may define INT32_DEFINED if it is already defined somewhere */
#if !defined(XMD_H) && !(_MSC_VER >= 1200) && !(__BORLANDC__ >= 0x550) /* X11/xmd.h correctly defines INT32 */ #ifndef INT32_DEFINED
#ifdef XMD_H
/* X11/xmd.h correctly defines INT32 */
#define INT32_DEFINED
#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
((defined(__MINGW32__) || defined(__CYGWIN__)) \
&& ((__GNUC__>=2) && (__GNUC_MINOR__>=95)))
/* INT32 is defined in windows.h for these compilers */
#define INT32_DEFINED
#include <windows.h>
#endif
#endif /* !INT32_DEFINED */
#ifndef INT32_DEFINED
typedef long INT32; typedef long INT32;
#endif #endif
/* Added JACS 23/4/99, to get INT32 definition */ #undef INT32_DEFINED
#if (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550)
#include <windows.h>
#endif
/* Datatype used for image dimensions. The JPEG standard only supports /* Datatype used for image dimensions. The JPEG standard only supports
* images up to 64K*64K due to 16-bit fields in SOF markers. Therefore * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore