From 1fdc8ef49e303d250b77b4acb7c9cfa560af5750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur+signed@gmail.com>
Date: Sat, 30 Dec 2017 00:09:17 +0100
Subject: [PATCH] Move definition of OPENRCT2_X86 macro

---
 src/openrct2/common.h      | 6 ++++++
 src/openrct2/util/Util.cpp | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 133d6c59c4..5427de05fc 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -203,6 +203,12 @@ typedef uint16 rct_string_id;
 #endif
 #define abstract = 0
 
+#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+    #define OPENRCT2_X86
+#elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
+    #define OPENRCT2_X86
+#endif
+
 #if defined(__i386__) || defined(_M_IX86)
 #define PLATFORM_X86
 #endif
diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp
index 2848e91199..b9833465a5 100644
--- a/src/openrct2/util/Util.cpp
+++ b/src/openrct2/util/Util.cpp
@@ -181,12 +181,10 @@ sint32 bitscanforward(sint32 source)
 #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
     #include <cpuid.h>
     #define OpenRCT2_CPUID_GNUC_X86
-    #define OPENRCT2_X86
 #elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
     #include <intrin.h>
     #include <nmmintrin.h>
     #define OpenRCT2_CPUID_MSVC_X86
-    #define OPENRCT2_X86
 #endif
 
 #ifdef OPENRCT2_X86