From 7372c89dc7f671a062a31ae5ce6bdb55319cbf70 Mon Sep 17 00:00:00 2001
From: Areloch <Areloch@gmail.com>
Date: Fri, 8 Jul 2016 22:48:24 -0500
Subject: [PATCH] Corrections suggested by timmy for both consistency, and
 making sure to catch all potential types.

---
 Engine/source/platform/types.gcc.h            | 4 ++--
 Engine/source/platformX86UNIX/x86UNIXMath.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Engine/source/platform/types.gcc.h b/Engine/source/platform/types.gcc.h
index 293c476bb..e61dcbafb 100644
--- a/Engine/source/platform/types.gcc.h
+++ b/Engine/source/platform/types.gcc.h
@@ -103,7 +103,7 @@ typedef unsigned long  U64;
 #  define TORQUE_OS_STRING "MacOS X"
 #  define TORQUE_OS_MAC
 #  include "platform/types.mac.h"
-#  if defined(__i386__)
+#  if defined(i386)
 // Disabling ASM on XCode for shared library build code relocation issues
 // This could be reconfigured for static builds, though minimal impact
 //#     define TORQUE_SUPPORTS_NASM
@@ -115,7 +115,7 @@ typedef unsigned long  U64;
 
 //--------------------------------------
 // Identify the CPU
-#if defined(__i386__)
+#if defined(i386) || defined(__i386) || defined(__i386__)
 #  define TORQUE_CPU_STRING "Intel x86"
 #  define TORQUE_CPU_X86
 #  define TORQUE_LITTLE_ENDIAN
diff --git a/Engine/source/platformX86UNIX/x86UNIXMath.cpp b/Engine/source/platformX86UNIX/x86UNIXMath.cpp
index 8cf9a5b40..6d3d141c3 100644
--- a/Engine/source/platformX86UNIX/x86UNIXMath.cpp
+++ b/Engine/source/platformX86UNIX/x86UNIXMath.cpp
@@ -131,7 +131,7 @@ F32 Platform::getRandom()
 }
 
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(TORQUE_CPU_X86) || defined(__x86_64__)
 
 U32 Platform::getMathControlState()
 {