From bbfd6a444c8394138a60da6d43fbcc43e0ca8ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Fri, 13 Oct 2017 07:38:24 -0700
Subject: [PATCH] Cleanup.

---
 include/bx/platform.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/bx/platform.h b/include/bx/platform.h
index 5356378..96b9202 100644
--- a/include/bx/platform.h
+++ b/include/bx/platform.h
@@ -46,11 +46,12 @@
 
 // Platform
 #define BX_PLATFORM_ANDROID    0
-#define BX_PLATFORM_EMSCRIPTEN 0
 #define BX_PLATFORM_BSD        0
+#define BX_PLATFORM_EMSCRIPTEN 0
 #define BX_PLATFORM_HURD       0
 #define BX_PLATFORM_IOS        0
 #define BX_PLATFORM_LINUX      0
+#define BX_PLATFORM_NX         0
 #define BX_PLATFORM_OSX        0
 #define BX_PLATFORM_PS4        0
 #define BX_PLATFORM_QNX        0
@@ -59,7 +60,6 @@
 #define BX_PLATFORM_WINDOWS    0
 #define BX_PLATFORM_WINRT      0
 #define BX_PLATFORM_XBOXONE    0
-#define BX_PLATFORM_NX         0
 
 // http://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers
 #if defined(__clang__)
@@ -252,26 +252,27 @@
 
 #define BX_PLATFORM_POSIX (0      \
 		|| BX_PLATFORM_ANDROID    \
-		|| BX_PLATFORM_EMSCRIPTEN \
 		|| BX_PLATFORM_BSD        \
+		|| BX_PLATFORM_EMSCRIPTEN \
 		|| BX_PLATFORM_HURD       \
 		|| BX_PLATFORM_IOS        \
 		|| BX_PLATFORM_LINUX      \
-		|| BX_PLATFORM_OSX        \
-		|| BX_PLATFORM_QNX        \
-		|| BX_PLATFORM_STEAMLINK  \
-		|| BX_PLATFORM_PS4        \
-		|| BX_PLATFORM_RPI        \
 		|| BX_PLATFORM_NX         \
+		|| BX_PLATFORM_OSX        \
+		|| BX_PLATFORM_PS4        \
+		|| BX_PLATFORM_QNX        \
+		|| BX_PLATFORM_RPI        \
+		|| BX_PLATFORM_STEAMLINK  \
 		)
 
 #define BX_PLATFORM_NONE !(0      \
 		|| BX_PLATFORM_ANDROID    \
-		|| BX_PLATFORM_EMSCRIPTEN \
 		|| BX_PLATFORM_BSD        \
+		|| BX_PLATFORM_EMSCRIPTEN \
 		|| BX_PLATFORM_HURD       \
 		|| BX_PLATFORM_IOS        \
 		|| BX_PLATFORM_LINUX      \
+		|| BX_PLATFORM_NX         \
 		|| BX_PLATFORM_OSX        \
 		|| BX_PLATFORM_PS4        \
 		|| BX_PLATFORM_QNX        \
@@ -280,7 +281,6 @@
 		|| BX_PLATFORM_WINDOWS    \
 		|| BX_PLATFORM_WINRT      \
 		|| BX_PLATFORM_XBOXONE    \
-		|| BX_PLATFORM_NX         \
 		)
 
 #if BX_COMPILER_GCC
@@ -314,19 +314,23 @@
 #if BX_PLATFORM_ANDROID
 #	define BX_PLATFORM_NAME "Android " \
 				BX_STRINGIZE(BX_PLATFORM_ANDROID)
+#elif BX_PLATFORM_BSD
+#	define BX_PLATFORM_NAME "BSD"
 #elif BX_PLATFORM_EMSCRIPTEN
 #	define BX_PLATFORM_NAME "asm.js " \
 				BX_STRINGIZE(__EMSCRIPTEN_major__) "." \
 				BX_STRINGIZE(__EMSCRIPTEN_minor__) "." \
 				BX_STRINGIZE(__EMSCRIPTEN_tiny__)
-#elif BX_PLATFORM_BSD
-#	define BX_PLATFORM_NAME "BSD"
 #elif BX_PLATFORM_HURD
 #	define BX_PLATFORM_NAME "Hurd"
 #elif BX_PLATFORM_IOS
 #	define BX_PLATFORM_NAME "iOS"
 #elif BX_PLATFORM_LINUX
 #	define BX_PLATFORM_NAME "Linux"
+#elif BX_PLATFORM_NONE
+#	define BX_PLATFORM_NAME "None"
+#elif BX_PLATFORM_NX
+#	define BX_PLATFORM_NAME "NX"
 #elif BX_PLATFORM_OSX
 #	define BX_PLATFORM_NAME "OSX"
 #elif BX_PLATFORM_PS4
@@ -343,10 +347,6 @@
 #	define BX_PLATFORM_NAME "WinRT"
 #elif BX_PLATFORM_XBOXONE
 #	define BX_PLATFORM_NAME "Xbox One"
-#elif BX_PLATFORM_NX
-#	define BX_PLATFORM_NAME "NX"
-#elif BX_PLATFORM_NONE
-#	define BX_PLATFORM_NAME "None"
 #else
 #	error "Unknown BX_PLATFORM!"
 #endif // BX_PLATFORM_