ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent jmorecfg.h from re-defining INT32 and INT16 if those types have already been defined by the Windows system headers.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@663 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-06-21 04:56:02 +00:00
parent 8c60d22ff5 b7120ca547
commit eed08614a6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@@ -53,6 +53,10 @@ v7 or v8 emulation or arithmetic coding support was enabled. Note that to
achieve full ABI compatibility with jpeg-6b, it is necessary to build achieve full ABI compatibility with jpeg-6b, it is necessary to build
libjpeg-turbo without arithmetic coding support. libjpeg-turbo without arithmetic coding support.
[14] Fixed an issue whereby Windows applications that used libjpeg-turbo would
fail to compile if the Windows system headers were included before jpeglib.h.
This issue was caused by a conflict in the definition of the INT32 type.
1.1.1 1.1.1
===== =====

7
win/jconfig.h.in
View File

@@ -25,6 +25,13 @@ typedef unsigned char boolean;
#endif #endif
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
/* Define "INT32" as int, not long, per Windows custom */
#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */
typedef short INT16;
typedef signed int INT32;
#endif
#define XMD_H /* prevent jmorecfg.h from redefining it */
#define inline __inline #define inline __inline
#ifdef JPEG_INTERNALS #ifdef JPEG_INTERNALS