diff options
| author | Tim Angus <tim@ngus.net> | 2011-01-24 22:07:34 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:54 +0000 |
| commit | f96ae257eab6fae9b4b4f4409c58dbce6915ac35 (patch) | |
| tree | c9828a3c3726d4b260493a710fd1f2f9f7bc6056 /src/jpeg-6b | |
| parent | a0101a6294268ef392b3fa4ecad12706e6cf4cf3 (diff) | |
* Merge ioq3-r1813
Diffstat (limited to 'src/jpeg-6b')
| -rw-r--r-- | src/jpeg-6b/jinclude.h | 3 | ||||
| -rw-r--r-- | src/jpeg-6b/jmorecfg.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/jpeg-6b/jinclude.h b/src/jpeg-6b/jinclude.h index 1c5515cd..33d2cd5b 100644 --- a/src/jpeg-6b/jinclude.h +++ b/src/jpeg-6b/jinclude.h @@ -14,6 +14,9 @@ * JPEG library. Most applications need only include jpeglib.h. */ +#ifdef __WIN64__ +#include "basetsd.h" +#endif #ifdef _MSC_VER diff --git a/src/jpeg-6b/jmorecfg.h b/src/jpeg-6b/jmorecfg.h index f8020071..d677127d 100644 --- a/src/jpeg-6b/jmorecfg.h +++ b/src/jpeg-6b/jmorecfg.h @@ -158,9 +158,11 @@ typedef short INT16; /* INT32 must hold at least signed 32-bit values. */ /* MinGW basetsd.h defines INT32 - don't redefine it */ -#if !(defined __MINGW32__ && defined _BASETSD_H) +#ifndef __WIN64 +#if !(defined __MINGW32__ && (defined _BASETSD_H || defined _BASETSD_H_)) typedef long INT32; #endif +#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 |