From 8c2fb6e44ea6fafbb886a67066c59afbaf13c369 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Mon, 4 Nov 2013 16:37:00 +0000
Subject: [PATCH] types.h - Explicitly use CPU architecture detection only for
 platforms that don't use autoconf. Fixes Linux build warnings. (Regression
 from r4824.)

---
 desmume/src/types.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/desmume/src/types.h b/desmume/src/types.h
index 5e6a77d78..2c3d8a0ee 100644
--- a/desmume/src/types.h
+++ b/desmume/src/types.h
@@ -19,13 +19,6 @@
 #ifndef TYPES_HPP
 #define TYPES_HPP
 
-// Determine CPU architecture
-#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
-	#define HOST_64
-#else
-	#define HOST_32
-#endif
-
 //analyze microsoft compilers
 #ifdef _MSC_VER
 	#define HOST_WINDOWS
@@ -35,6 +28,15 @@
 
 #endif //_MSC_VER
 
+// Determine CPU architecture for platforms that don't use the autoconf script
+#if defined(HOST_WINDOWS) || defined(DESMUME_COCOA)
+	#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
+		#define HOST_64
+	#else
+		#define HOST_32
+	#endif
+#endif
+
 //enforce a constraint: gdb stub requires developer
 #if defined(GDB_STUB) && !defined(DEVELOPER)
 #define DEVELOPER