From df30c9d13185a525d2c45de3becd39c4a178f484 Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Thu, 22 Sep 2005 03:21:33 +0000
Subject: * Port to MinGW

git-svn-id: svn://svn.icculus.org/quake3/trunk@97 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/jpeg-6/jinclude.h | 2 +-
 code/jpeg-6/jmorecfg.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'code/jpeg-6')

diff --git a/code/jpeg-6/jinclude.h b/code/jpeg-6/jinclude.h
index eadcd19..aede8ec 100644
--- a/code/jpeg-6/jinclude.h
+++ b/code/jpeg-6/jinclude.h
@@ -15,7 +15,7 @@
  */
 
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 
 #pragma warning(disable : 4018)     // signed/unsigned mismatch
 #pragma warning(disable : 4032)
diff --git a/code/jpeg-6/jmorecfg.h b/code/jpeg-6/jmorecfg.h
index 1fc0a19..a2fea83 100644
--- a/code/jpeg-6/jmorecfg.h
+++ b/code/jpeg-6/jmorecfg.h
@@ -149,7 +149,9 @@ typedef unsigned short UINT16;
 typedef unsigned int UINT16;
 #endif /* HAVE_UNSIGNED_SHORT */
 
+#ifndef DONT_TYPEDEF_INT32
 typedef long INT32;
+#endif
 
 /* INT16 must hold at least the values -32768..32767. */
 
-- 
cgit v1.2.3