From 49ab6d028984a582a9683e30d6e995c7efa3f804 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 May 2011 16:47:22 +0200
Subject: COMMON: If config.h is present, don't use hardcoded settings from
 scummsys.h

---
 common/scummsys.h | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'common')

diff --git a/common/scummsys.h b/common/scummsys.h
index b661aca198..55429fb847 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -116,6 +116,21 @@
 #endif
 
 
+//
+// Define scumm_stricmp and scumm_strnicmp
+//
+#if defined(_WIN32_WCE) || defined(_MSC_VER)
+	#define scumm_stricmp stricmp
+	#define scumm_strnicmp _strnicmp
+#elif defined(__MINGW32__) || defined(__GP32__) || defined(__DS__)
+	#define scumm_stricmp stricmp
+	#define scumm_strnicmp strnicmp
+#else
+	#define scumm_stricmp strcasecmp
+	#define scumm_strnicmp strncasecmp
+#endif
+
+
 // In the following we configure various targets, in particular those
 // which can't use our "configure" tool and hence don't use config.h.
 //
@@ -134,26 +149,6 @@
 //    - ...
 // ...
 
-// We define all types in config.h, so we don't want to typedef those types
-// here again!
-#ifdef HAVE_CONFIG_H
-#define SCUMMVM_DONT_DEFINE_TYPES
-#endif
-
-//
-// Define scumm_stricmp and scumm_strnicmp
-//
-#if defined(_WIN32_WCE) || defined(_MSC_VER)
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp _strnicmp
-#elif defined(__MINGW32__) || defined(__GP32__) || defined(__DS__)
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp strnicmp
-#else
-	#define scumm_stricmp strcasecmp
-	#define scumm_strnicmp strncasecmp
-#endif
-
 
 //
 // By default we try to use pragma push/pop to ensure various structs we use
@@ -169,7 +164,11 @@
 #define SCUMMVM_USE_PRAGMA_PACK
 
 
-#if defined(__SYMBIAN32__)
+#if defined(HAVE_CONFIG_H)
+	// All settings should have been set in config.h
+	#define SCUMMVM_DONT_DEFINE_TYPES
+
+#elif defined(__SYMBIAN32__)
 
 	#define SCUMM_LITTLE_ENDIAN
 	#define SCUMM_NEED_ALIGNMENT
-- 
cgit v1.2.3