From 55f46d36671b1ceb23b06a7ce00627379352f9ca Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 24 Sep 2017 19:06:17 +0200
Subject: BUILD: Define pointer sized integer types and remove SCUMM_64BITS

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

(limited to 'common')

diff --git a/common/scummsys.h b/common/scummsys.h
index 432dd74fa7..42fcdf79dd 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -309,26 +309,6 @@
 	#endif
 #endif
 
-//
-// Determine 64 bitness
-// Reference: http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros
-//
-#if !defined(HAVE_CONFIG_H)
-
-	#if defined(__x86_64__) || \
-		  defined(_M_X64) || \
-		  defined(__ppc64__) || \
-		  defined(__powerpc64__) || \
-		  defined(__LP64__)
-
-		#if !defined(SCUMM_64BITS)
-			#define SCUMM_64BITS
-		#endif
-
-	#endif
-
-#endif
-
 //
 // Some more system specific settings.
 // TODO/FIXME: All of these should be moved to backend specific files (such as portdefs.h)
@@ -452,6 +432,27 @@
 	#endif
 #endif
 
+//
+// Determine 64 bitness
+// Reference: http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros
+//
+#if !defined(HAVE_CONFIG_H)
+
+#if defined(__x86_64__) || \
+		  defined(_M_X64) || \
+		  defined(__ppc64__) || \
+		  defined(__powerpc64__) || \
+		  defined(__LP64__)
+
+typedef uint64 uintptr;
+
+#else
+
+typedef uint32 uintptr;
+
+#endif
+
+#endif
 
 //
 // Overlay color type (FIXME: shouldn't be declared here)
-- 
cgit v1.2.3