vm: fix compilation on 64-bit platforms

diff --git a/vm/master.hpp b/vm/master.hpp
index 52fe70240149a82fae708f474c065b22f4f7498f..9a920efce73b170d78a3fcb855cb5906905e2e1b 100755 (executable)
--- 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 a3434e2ad04f172d7d19fcf1ce7642c1d3d2e4ab..96e19ad7f4b9eb71c5ef7d656c1543815e680000 100644 (file)
--- 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"