platform.hpp: Indent so I can see wtf is going on with the preprocessor control flow.
Look for ``__linux__`` on linux instead of ``linux`` because compiling with -std=c++11 removes the ``linux`` preprocessor symbol.db4
parent
64ccac3572
commit
1d58f827a2
108
vm/platform.hpp
108
vm/platform.hpp
|
@ -1,67 +1,65 @@
|
||||||
#if defined(WINDOWS)
|
#if defined(WINDOWS)
|
||||||
#if defined(WINNT)
|
#if defined(WINNT)
|
||||||
#include "os-windows.hpp"
|
#include "os-windows.hpp"
|
||||||
|
#if defined(FACTOR_AMD64)
|
||||||
|
#include "os-windows.64.hpp"
|
||||||
|
#elif defined(FACTOR_X86)
|
||||||
|
#include "os-windows.32.hpp"
|
||||||
|
#else
|
||||||
|
#error "Unsupported Windows flavor"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#error "Unsupported Windows flavor"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#include "os-unix.hpp"
|
||||||
|
|
||||||
#if defined(FACTOR_AMD64)
|
#ifdef __APPLE__
|
||||||
#include "os-windows.64.hpp"
|
#include "os-macosx.hpp"
|
||||||
#elif defined(FACTOR_X86)
|
#include "mach_signal.hpp"
|
||||||
#include "os-windows.32.hpp"
|
|
||||||
#else
|
|
||||||
#error "Unsupported Windows flavor"
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#error "Unsupported Windows flavor"
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#include "os-unix.hpp"
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef FACTOR_X86
|
||||||
#include "os-macosx.hpp"
|
#include "os-macosx-x86.32.hpp"
|
||||||
#include "mach_signal.hpp"
|
#elif defined(FACTOR_AMD64)
|
||||||
|
#include "os-macosx-x86.64.hpp"
|
||||||
|
#else
|
||||||
|
#error "Unsupported Mac OS X flavor"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#include "os-genunix.hpp"
|
||||||
|
#if defined(__linux__)
|
||||||
|
#define FACTOR_OS_STRING "linux"
|
||||||
|
#include "os-linux.hpp"
|
||||||
|
|
||||||
#ifdef FACTOR_X86
|
#if defined(FACTOR_X86)
|
||||||
#include "os-macosx-x86.32.hpp"
|
#include "os-linux-x86.32.hpp"
|
||||||
#elif defined(FACTOR_AMD64)
|
#elif defined(FACTOR_PPC64)
|
||||||
#include "os-macosx-x86.64.hpp"
|
#include "os-linux-ppc.64.hpp"
|
||||||
#else
|
#elif defined(FACTOR_PPC32)
|
||||||
#error "Unsupported Mac OS X flavor"
|
#include "os-linux-ppc.32.hpp"
|
||||||
#endif
|
#elif defined(FACTOR_ARM)
|
||||||
#else
|
#include "os-linux-arm.hpp"
|
||||||
#include "os-genunix.hpp"
|
#elif defined(FACTOR_AMD64)
|
||||||
|
#include "os-linux-x86.64.hpp"
|
||||||
#if defined(linux)
|
#else
|
||||||
#define FACTOR_OS_STRING "linux"
|
#error "Unsupported Linux flavor"
|
||||||
#include "os-linux.hpp"
|
#endif
|
||||||
|
#else
|
||||||
#if defined(FACTOR_X86)
|
#error "Unsupported OS"
|
||||||
#include "os-linux-x86.32.hpp"
|
#endif
|
||||||
#elif defined(FACTOR_PPC64)
|
#endif
|
||||||
#include "os-linux-ppc.64.hpp"
|
|
||||||
#elif defined(FACTOR_PPC32)
|
|
||||||
#include "os-linux-ppc.32.hpp"
|
|
||||||
#elif defined(FACTOR_ARM)
|
|
||||||
#include "os-linux-arm.hpp"
|
|
||||||
#elif defined(FACTOR_AMD64)
|
|
||||||
#include "os-linux-x86.64.hpp"
|
|
||||||
#else
|
|
||||||
#error "Unsupported Linux flavor"
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#error "Unsupported OS"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(FACTOR_X86)
|
#if defined(FACTOR_X86)
|
||||||
#include "cpu-x86.32.hpp"
|
#include "cpu-x86.32.hpp"
|
||||||
#include "cpu-x86.hpp"
|
#include "cpu-x86.hpp"
|
||||||
#elif defined(FACTOR_AMD64)
|
#elif defined(FACTOR_AMD64)
|
||||||
#include "cpu-x86.64.hpp"
|
#include "cpu-x86.64.hpp"
|
||||||
#include "cpu-x86.hpp"
|
#include "cpu-x86.hpp"
|
||||||
#elif defined(FACTOR_PPC)
|
#elif defined(FACTOR_PPC)
|
||||||
#include "cpu-ppc.hpp"
|
#include "cpu-ppc.hpp"
|
||||||
#elif defined(FACTOR_ARM)
|
#elif defined(FACTOR_ARM)
|
||||||
#include "cpu-arm.hpp"
|
#include "cpu-arm.hpp"
|
||||||
#else
|
#else
|
||||||
#error "Unsupported CPU"
|
#error "Unsupported CPU"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue