aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-06-02 19:56:43 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-06-02 19:56:43 +0000
commit0145ca358ae7ac7dc1e513ce5166791877381132 (patch)
treef2505d413d7f6c65a641fe610cdc170731ceb907 /code
parentf258d5ed829866e2bf8716dea3d1efcd8ba3d608 (diff)
downloadioquake3-aero-0145ca358ae7ac7dc1e513ce5166791877381132.tar.gz
ioquake3-aero-0145ca358ae7ac7dc1e513ce5166791877381132.zip
* Remove silly MINGW_CFLAGS hack
git-svn-id: svn://svn.icculus.org/quake3/trunk@1096 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
-rw-r--r--code/jpeg-6/jerror.c4
-rw-r--r--code/jpeg-6/jmemnobs.c4
-rw-r--r--code/jpeg-6/jmorecfg.h11
3 files changed, 8 insertions, 11 deletions
diff --git a/code/jpeg-6/jerror.c b/code/jpeg-6/jerror.c
index 255c092..026e2d1 100644
--- a/code/jpeg-6/jerror.c
+++ b/code/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/code/jpeg-6/jmemnobs.c b/code/jpeg-6/jmemnobs.c
index ea7ead7..87533a1 100644
--- a/code/jpeg-6/jmemnobs.c
+++ b/code/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/code/jpeg-6/jmorecfg.h b/code/jpeg-6/jmorecfg.h
index a2fea83..4cae5a4 100644
--- a/code/jpeg-6/jmorecfg.h
+++ b/code/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