steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: fix compilation on 64-bit platforms

db4
Slava Pestov 2010-01-14 02:18:49 +13:00
parent ce2487e6c0
commit 2aa4d3d432
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vm/master.hpp
View File

@ -30,6 +30,24 @@
#include <vector> #include <vector>
#include <iostream> #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 */ /* Forward-declare this since it comes up in function prototypes */
namespace factor namespace factor
{ {

17
vm/platform.hpp
View File

@ -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(WINDOWS)
#if defined(WINCE) #if defined(WINCE)
#include "os-windows-ce.hpp" #include "os-windows-ce.hpp"