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 | |
| parent | 655d4c12eea45edf2041300eccace352a503b690 (diff) | |
* Merge of ioq3-r1112
Diffstat (limited to 'src/jpeg-6')
| -rw-r--r-- | src/jpeg-6/jerror.c | 4 | ||||
| -rw-r--r-- | src/jpeg-6/jmemnobs.c | 4 | ||||
| -rw-r--r-- | src/jpeg-6/jmorecfg.h | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/jpeg-6/jerror.c b/src/jpeg-6/jerror.c index 255c0921..026e2d11 100644 --- a/src/jpeg-6/jerror.c +++ b/src/jpeg-6/jerror.c @@ -13,14 +13,14 @@ * These routines are used by both the compression and decompression code. */ +#include "../renderer/tr_local.h" + /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ #include "jinclude.h" #include "jpeglib.h" #include "jversion.h" #include "jerror.h" -#include "../renderer/tr_local.h" - #ifndef EXIT_FAILURE /* define exit() codes if not provided */ #define EXIT_FAILURE 1 #endif diff --git a/src/jpeg-6/jmemnobs.c b/src/jpeg-6/jmemnobs.c index ea7ead71..87533a19 100644 --- a/src/jpeg-6/jmemnobs.c +++ b/src/jpeg-6/jmemnobs.c @@ -15,13 +15,13 @@ * Note that the max_memory_to_use option is ignored by this implementation. */ +#include "../renderer/tr_local.h" + #define JPEG_INTERNALS #include "jinclude.h" #include "jpeglib.h" #include "jmemsys.h" /* import the system-dependent declarations */ -#include "../renderer/tr_local.h" - /* * Memory allocation and ri.Freeing are controlled by the regular library * routines ri.Malloc() and ri.Free(). 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 |