From: Erik Charlebois Date: Sun, 12 May 2013 02:24:50 +0000 (-0400) Subject: VM: Refactor platform.hpp to Factor style X-Git-Tag: 0.97~1272 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=5e7792e9b93cf490077e082e4718f821b7077041 VM: Refactor platform.hpp to Factor style --- diff --git a/vm/platform.hpp b/vm/platform.hpp index 57e702f23f..8d19123b9e 100644 --- a/vm/platform.hpp +++ b/vm/platform.hpp @@ -1,67 +1,67 @@ #if defined(WINDOWS) - #if defined(WINNT) - #include "os-windows.hpp" +#if defined(WINNT) +#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 +#if defined(FACTOR_AMD64) +#include "os-windows.64.hpp" +#elif defined(FACTOR_X86) +#include "os-windows.32.hpp" #else - #include "os-unix.hpp" +#error "Unsupported Windows flavor" +#endif +#else +#error "Unsupported Windows flavor" +#endif +#else +#include "os-unix.hpp" + +#ifdef __APPLE__ +#include "os-macosx.hpp" +#include "mach_signal.hpp" - #ifdef __APPLE__ - #include "os-macosx.hpp" - #include "mach_signal.hpp" - - #ifdef FACTOR_X86 - #include "os-macosx-x86.32.hpp" - #elif defined(FACTOR_AMD64) - #include "os-macosx-x86.64.hpp" - #else - #error "Unsupported Mac OS X flavor" - #endif - #else - #include "os-genunix.hpp" +#ifdef FACTOR_X86 +#include "os-macosx-x86.32.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" +#if defined(linux) +#define FACTOR_OS_STRING "linux" +#include "os-linux.hpp" - #if defined(FACTOR_X86) - #include "os-linux-x86.32.hpp" - #elif defined(FACTOR_PPC64) - #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 +#if defined(FACTOR_X86) +#include "os-linux-x86.32.hpp" +#elif defined(FACTOR_PPC64) +#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 #if defined(FACTOR_X86) - #include "cpu-x86.32.hpp" - #include "cpu-x86.hpp" +#include "cpu-x86.32.hpp" +#include "cpu-x86.hpp" #elif defined(FACTOR_AMD64) - #include "cpu-x86.64.hpp" - #include "cpu-x86.hpp" +#include "cpu-x86.64.hpp" +#include "cpu-x86.hpp" #elif defined(FACTOR_PPC) - #include "cpu-ppc.hpp" +#include "cpu-ppc.hpp" #elif defined(FACTOR_ARM) - #include "cpu-arm.hpp" +#include "cpu-arm.hpp" #else - #error "Unsupported CPU" +#error "Unsupported CPU" #endif