From 2aa4d3d4325f591a152d695a104a592466b7bdb3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 14 Jan 2010 02:18:49 +1300
Subject: [PATCH] vm: fix compilation on 64-bit platforms

---
 vm/master.hpp   | 18 ++++++++++++++++++
 vm/platform.hpp | 17 -----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/vm/master.hpp b/vm/master.hpp
index 52fe702401..9a920efce7 100755
--- a/vm/master.hpp
+++ b/vm/master.hpp
@@ -30,6 +30,24 @@
 #include <vector>
 #include <iostream>
 
+/* Detect target CPU type */
+#if defined(__arm__)
+	#define FACTOR_ARM
+#elif defined(__amd64__) || defined(__x86_64__)
+	#define FACTOR_AMD64
+	#define FACTOR_64
+#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32)
+	#define FACTOR_X86
+#elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
+	#define FACTOR_PPC
+#else
+	#error "Unsupported architecture"
+#endif
+
+#ifdef WIN32
+	#define WINDOWS
+#endif
+
 /* Forward-declare this since it comes up in function prototypes */
 namespace factor
 {
diff --git a/vm/platform.hpp b/vm/platform.hpp
index a3434e2ad0..96e19ad7f4 100644
--- a/vm/platform.hpp
+++ b/vm/platform.hpp
@@ -1,20 +1,3 @@
-#if defined(__arm__)
-	#define FACTOR_ARM
-#elif defined(__amd64__) || defined(__x86_64__)
-	#define FACTOR_AMD64
-	#define FACTOR_64
-#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32)
-	#define FACTOR_X86
-#elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
-	#define FACTOR_PPC
-#else
-	#error "Unsupported architecture"
-#endif
-
-#ifdef WIN32
-	#define WINDOWS
-#endif
-
 #if defined(WINDOWS)
 	#if defined(WINCE)
 		#include "os-windows-ce.hpp"