diff options
| author | Tim Angus <tim@ngus.net> | 2007-07-15 14:15:41 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-07-15 14:15:41 +0000 |
| commit | ffbf946dd63dccf0d6b6553c8bc1c9da4d3c89b3 (patch) | |
| tree | 62b48381afabceca4c2aad7c39e0eeb51e328126 /src/jpeg-6/jmorecfg.h | |
| parent | 655d4c12eea45edf2041300eccace352a503b690 (diff) | |
* Merge of ioq3-r1112
Diffstat (limited to 'src/jpeg-6/jmorecfg.h')
| -rw-r--r-- | src/jpeg-6/jmorecfg.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/jpeg-6/jmorecfg.h b/src/jpeg-6/jmorecfg.h index a2fea833..4cae5a4f 100644 --- a/src/jpeg-6/jmorecfg.h +++ b/src/jpeg-6/jmorecfg.h @@ -149,7 +149,10 @@ typedef unsigned short UINT16; typedef unsigned int UINT16; #endif /* HAVE_UNSIGNED_SHORT */ -#ifndef DONT_TYPEDEF_INT32 +/* INT32 must hold at least signed 32-bit values. */ + +/* MinGW basetsd.h defines INT32 - don't redefine it */ +#if !(defined __MINGW32__ && defined _BASETSD_H) typedef long INT32; #endif @@ -159,12 +162,6 @@ typedef long INT32; typedef short INT16; #endif -/* INT32 must hold at least signed 32-bit values. */ - -//#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -//typedef long INT32; -//#endif - /* Datatype used for image dimensions. The JPEG standard only supports * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore * "unsigned int" is sufficient on all machines. However, if you need to |