Update Win64 support

[factor.git] / vm / master.hpp

diff --git a/vm/master.hpp b/vm/master.hpp
index f4c093447847c498160fd0862ee2c5f64cf2b854..70736c1bd9d127dbe26c29b5bf7b75a885dd848b 100755 (executable)
--- a/vm/master.hpp
+++ b/vm/master.hpp
@@ -32,10 +32,10 @@
 /* Detect target CPU type */
 #if defined(__arm__)
        #define FACTOR_ARM
-#elif defined(__amd64__) || defined(__x86_64__)
+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
        #define FACTOR_AMD64
        #define FACTOR_64
-#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32) || defined(_MSC_VER)
+#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
        #define FACTOR_X86
 #elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
        #define FACTOR_PPC
@@ -50,10 +50,6 @@
        #define WINDOWS
 #endif
 
-#ifndef _MSC_VER
-       #include <stdbool.h>
-#endif
-
 /* Forward-declare this since it comes up in function prototypes */
 namespace factor
 {