From 2fe29575c447e6531a20a32dbec542f29e5f589d Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 2 Jun 2007 19:56:43 +0000
Subject: [PATCH] * Remove silly MINGW_CFLAGS hack

---
 Makefile               |  7 +++----
 code/jpeg-6/jerror.c   |  4 ++--
 code/jpeg-6/jmemnobs.c |  4 ++--
 code/jpeg-6/jmorecfg.h | 11 ++++-------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index bd6bea70..95d27c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,6 @@ endif
   endif
 
   GL_CFLAGS =
-  MINGW_CFLAGS = -DDONT_TYPEDEF_INT32
 
   OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math -falign-loops=2 \
     -funroll-loops -falign-jumps=2 -falign-functions=2 -fstrength-reduce
@@ -1197,10 +1196,10 @@ $(B)/client/jdmaster.o : $(JPDIR)/jdmaster.c; $(DO_CC)
 $(B)/client/jdpostct.o : $(JPDIR)/jdpostct.c; $(DO_CC)
 $(B)/client/jdsample.o : $(JPDIR)/jdsample.c; $(DO_CC)
 $(B)/client/jdtrans.o : $(JPDIR)/jdtrans.c; $(DO_CC)
-$(B)/client/jerror.o : $(JPDIR)/jerror.c; $(DO_CC) $(GL_CFLAGS) $(MINGW_CFLAGS)
+$(B)/client/jerror.o : $(JPDIR)/jerror.c; $(DO_CC) $(GL_CFLAGS)
 $(B)/client/jidctflt.o : $(JPDIR)/jidctflt.c; $(DO_CC)
 $(B)/client/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC)
-$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
+$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS)
 $(B)/client/jutils.o : $(JPDIR)/jutils.c; $(DO_CC)
 
 $(B)/client/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC)  $(GL_CFLAGS)
@@ -1210,7 +1209,7 @@ $(B)/client/tr_cmds.o : $(RDIR)/tr_cmds.c; $(DO_CC)  $(GL_CFLAGS)
 $(B)/client/tr_curve.o : $(RDIR)/tr_curve.c; $(DO_CC)  $(GL_CFLAGS)
 $(B)/client/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC)  $(GL_CFLAGS)
 $(B)/client/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC)   $(GL_CFLAGS)
-$(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS) $(MINGW_CFLAGS)
+$(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS)
 $(B)/client/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC)    $(GL_CFLAGS)
 $(B)/client/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC)  $(GL_CFLAGS)
 $(B)/client/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC)   $(GL_CFLAGS)
diff --git a/code/jpeg-6/jerror.c b/code/jpeg-6/jerror.c
index 255c0921..026e2d11 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 ea7ead71..87533a19 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 a2fea833..4cae5a4f 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