Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / platform.hpp

diff --git a/vm/platform.hpp b/vm/platform.hpp
index 96e19ad7f4b9eb71c5ef7d656c1543815e680000..c3ae476345844b8eb6320e7f2b144114e67e979e 100644 (file)
--- a/vm/platform.hpp
+++ b/vm/platform.hpp
@@ -1,111 +1,79 @@
 #if defined(WINDOWS)
-       #if defined(WINCE)
-               #include "os-windows-ce.hpp"
-       #else
-               #include "os-windows-nt.hpp"
-       #endif
-
-       #include "os-windows.hpp"
-
-       #if defined(FACTOR_AMD64)
-               #include "os-windows-nt.64.hpp"
-       #elif defined(FACTOR_X86)
-               #include "os-windows-nt.32.hpp"
-       #endif
+  #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
 #else
-       #include "os-unix.hpp"
-
-       #ifdef __APPLE__
-               #include "os-macosx.hpp"
-               #include "mach_signal.hpp"
-               
-               #ifdef FACTOR_X86
-                       #include "os-macosx-x86.32.hpp"
-               #elif defined(FACTOR_PPC)
-                       #include "os-macosx-ppc.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 __FreeBSD__
-                       #define FACTOR_OS_STRING "freebsd"
-                       #include "os-freebsd.hpp"
-                       
-                       #if defined(FACTOR_X86)
-                               #include "os-freebsd-x86.32.hpp"
-                       #elif defined(FACTOR_AMD64)
-                               #include "os-freebsd-x86.64.hpp"
-                       #else
-                               #error "Unsupported FreeBSD flavor"
-                       #endif
-               #elif defined(__OpenBSD__)
-                       #define FACTOR_OS_STRING "openbsd"
-
-                       #if defined(FACTOR_X86)
-                               #include "os-openbsd-x86.32.hpp"
-                       #elif defined(FACTOR_AMD64)
-                               #include "os-openbsd-x86.64.hpp"
-                       #else
-                               #error "Unsupported OpenBSD flavor"
-                       #endif
-               #elif defined(__NetBSD__)
-                       #define FACTOR_OS_STRING "netbsd"
-
-                       #if defined(FACTOR_X86)
-                               #include "os-netbsd-x86.32.hpp"
-                       #elif defined(FACTOR_AMD64)
-                               #include "os-netbsd-x86.64.hpp"
-                       #else
-                               #error "Unsupported NetBSD flavor"
-                       #endif
-
-                       #include "os-netbsd.hpp"
-               #elif defined(linux)
-                       #define FACTOR_OS_STRING "linux"
-                       #include "os-linux.hpp"
-
-                       #if defined(FACTOR_X86)
-                               #include "os-linux-x86.32.hpp"
-                       #elif defined(FACTOR_PPC)
-                               #include "os-linux-ppc.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
-               #elif defined(__SVR4) && defined(sun)
-                       #define FACTOR_OS_STRING "solaris"
+  #include "os-unix.hpp"
 
-                       #if defined(FACTOR_X86)
-                               #include "os-solaris-x86.32.hpp"
-                       #elif defined(FACTOR_AMD64)
-                               #include "os-solaris-x86.64.hpp"
-                       #else
-                               #error "Unsupported Solaris flavor"
-                       #endif
+  #ifdef __APPLE__
+    #include "os-macosx.hpp"
+    #include "mach_signal.hpp"
 
-               #else
-                       #error "Unsupported OS"
-               #endif
-       #endif
+    #ifdef FACTOR_X86
+      #include "os-macosx-x86.32.hpp"
+    #elif defined(FACTOR_AMD64)
+      #include "os-macosx-x86.64.hpp"
+    #elif defined(FACTOR_ARM64)
+      #include "os-macosx-arm64.hpp"
+    #else
+      #error "Unsupported Mac OS X flavor"
+    #endif
+  #else
+    #include "os-genunix.hpp"
+    #if defined(__FreeBSD__)
+       #define FACTOR_OS_STRING "freebsd"
+       #include "os-freebsd.hpp"
+        #if defined(FACTOR_X86)
+           #include "os-freebsd-x86.32.hpp"
+        #elif defined(FACTOR_AMD64)
+           #include "os-freebsd-x86.64.hpp"
+        #else
+            #error "Unsupported FreeBSD flavor"
+        #endif
+    #elif 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_ARM64)
+        #include "os-linux-arm.64.hpp"
+      #elif defined(FACTOR_AMD64)
+        #include "os-linux-x86.64.hpp"
+      #else
+        #error "Unsupported Linux flavor"
+      #endif
+    #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"
+#elif defined(FACTOR_ARM64)
+  #include "cpu-arm.64.hpp"
+  #include "cpu-arm.hpp"
 #else
-       #error "Unsupported CPU"
+  #error "Unsupported CPU"
 #endif