From a8cf4e3b0775a2f07df4c75205bafb480ff3feff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Sun, 16 Jun 2019 09:09:11 -0700
Subject: [PATCH] Fixed ifdef order.

---
 include/bx/platform.h | 12 ++++++------
 src/file.cpp          |  4 ++--
 src/mutex.cpp         |  4 ++--
 src/os.cpp            | 13 ++++++-------
 src/thread.cpp        |  4 ++--
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/include/bx/platform.h b/include/bx/platform.h
index c911c87..326f42e 100644
--- a/include/bx/platform.h
+++ b/include/bx/platform.h
@@ -48,6 +48,7 @@
 #define BX_PLATFORM_ANDROID    0
 #define BX_PLATFORM_BSD        0
 #define BX_PLATFORM_EMSCRIPTEN 0
+#define BX_PLATFORM_HAIKU      0
 #define BX_PLATFORM_HURD       0
 #define BX_PLATFORM_IOS        0
 #define BX_PLATFORM_LINUX      0
@@ -59,7 +60,6 @@
 #define BX_PLATFORM_WINDOWS    0
 #define BX_PLATFORM_WINRT      0
 #define BX_PLATFORM_XBOXONE    0
-#define BX_PLATFORM_HAIKU      0
 
 // http://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers
 #if defined(__clang__)
@@ -261,6 +261,7 @@
 	||  BX_PLATFORM_ANDROID    \
 	||  BX_PLATFORM_BSD        \
 	||  BX_PLATFORM_EMSCRIPTEN \
+	||  BX_PLATFORM_HAIKU      \
 	||  BX_PLATFORM_HURD       \
 	||  BX_PLATFORM_IOS        \
 	||  BX_PLATFORM_LINUX      \
@@ -269,7 +270,6 @@
 	||  BX_PLATFORM_PS4        \
 	||  BX_PLATFORM_RPI        \
 	||  BX_PLATFORM_STEAMLINK  \
-	||  BX_PLATFORM_HAIKU      \
 	)
 
 ///
@@ -277,6 +277,7 @@
 	||  BX_PLATFORM_ANDROID    \
 	||  BX_PLATFORM_BSD        \
 	||  BX_PLATFORM_EMSCRIPTEN \
+	||  BX_PLATFORM_HAIKU      \
 	||  BX_PLATFORM_HURD       \
 	||  BX_PLATFORM_IOS        \
 	||  BX_PLATFORM_LINUX      \
@@ -288,7 +289,6 @@
 	||  BX_PLATFORM_WINDOWS    \
 	||  BX_PLATFORM_WINRT      \
 	||  BX_PLATFORM_XBOXONE    \
-	||  BX_PLATFORM_HAIKU      \
 	)
 
 ///
@@ -302,11 +302,11 @@
 ///
 #define BX_PLATFORM_OS_DESKTOP  (0 \
 	||  BX_PLATFORM_BSD            \
+	||  BX_PLATFORM_HAIKU          \
 	||  BX_PLATFORM_HURD           \
 	||  BX_PLATFORM_LINUX          \
 	||  BX_PLATFORM_OSX            \
 	||  BX_PLATFORM_WINDOWS        \
-	||  BX_PLATFORM_HAIKU          \
 	)
 
 ///
@@ -365,6 +365,8 @@
 		BX_STRINGIZE(__EMSCRIPTEN_major__) "." \
 		BX_STRINGIZE(__EMSCRIPTEN_minor__) "." \
 		BX_STRINGIZE(__EMSCRIPTEN_tiny__)
+#elif BX_PLATFORM_HAIKU
+#	define BX_PLATFORM_NAME "Haiku"
 #elif BX_PLATFORM_HURD
 #	define BX_PLATFORM_NAME "Hurd"
 #elif BX_PLATFORM_IOS
@@ -389,8 +391,6 @@
 #	define BX_PLATFORM_NAME "WinRT"
 #elif BX_PLATFORM_XBOXONE
 #	define BX_PLATFORM_NAME "Xbox One"
-#elif BX_PLATFORM_HAIKU
-#	define BX_PLATFORM_NAME "Haiku"
 #else
 #	error "Unknown BX_PLATFORM!"
 #endif // BX_PLATFORM_
diff --git a/src/file.cpp b/src/file.cpp
index f94d759..aea285e 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -74,9 +74,9 @@ namespace bx
 #	elif 0                   \
 	  || BX_PLATFORM_ANDROID \
 	  || BX_PLATFORM_BSD     \
+	  || BX_PLATFORM_HAIKU   \
 	  || BX_PLATFORM_IOS     \
-	  || BX_PLATFORM_OSX     \
-	  || BX_PLATFORM_HAIKU
+	  || BX_PLATFORM_OSX
 #		define fseeko64 fseeko
 #		define ftello64 ftello
 #	elif BX_PLATFORM_PS4
diff --git a/src/mutex.cpp b/src/mutex.cpp
index 93c6cd6..48f09d0 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -12,12 +12,12 @@
 #	include <bx/cpu.h>
 #	include "crt0.h"
 #elif  BX_PLATFORM_ANDROID \
+	|| BX_PLATFORM_HAIKU   \
 	|| BX_PLATFORM_LINUX   \
 	|| BX_PLATFORM_IOS     \
 	|| BX_PLATFORM_OSX     \
 	|| BX_PLATFORM_PS4     \
-	|| BX_PLATFORM_RPI     \
-	|| BX_PLATFORM_HAIKU
+	|| BX_PLATFORM_RPI
 #	include <pthread.h>
 #elif  BX_PLATFORM_WINDOWS \
 	|| BX_PLATFORM_WINRT   \
diff --git a/src/os.cpp b/src/os.cpp
index 555ae57..5be184a 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -18,24 +18,24 @@
 #	include <windows.h>
 #	include <psapi.h>
 #elif  BX_PLATFORM_ANDROID    \
-	|| BX_PLATFORM_EMSCRIPTEN \
 	|| BX_PLATFORM_BSD        \
+	|| BX_PLATFORM_EMSCRIPTEN \
+	|| BX_PLATFORM_HAIKU      \
 	|| BX_PLATFORM_HURD       \
 	|| BX_PLATFORM_IOS        \
 	|| BX_PLATFORM_LINUX      \
+	|| BX_PLATFORM_NX         \
 	|| BX_PLATFORM_OSX        \
 	|| BX_PLATFORM_PS4        \
 	|| BX_PLATFORM_RPI        \
-	|| BX_PLATFORM_STEAMLINK  \
-	|| BX_PLATFORM_NX         \
-	|| BX_PLATFORM_HAIKU
+	|| BX_PLATFORM_STEAMLINK
 #	include <sched.h> // sched_yield
 #	if BX_PLATFORM_BSD       \
+	|| BX_PLATFORM_HAIKU     \
 	|| BX_PLATFORM_IOS       \
 	|| BX_PLATFORM_OSX       \
 	|| BX_PLATFORM_PS4       \
-	|| BX_PLATFORM_STEAMLINK \
-	|| BX_PLATFORM_HAIKU
+	|| BX_PLATFORM_STEAMLINK
 #		include <pthread.h> // mach_port_t
 #	endif // BX_PLATFORM_*
 
@@ -67,7 +67,6 @@
 
 namespace bx
 {
-
 	void sleep(uint32_t _ms)
 	{
 #if BX_PLATFORM_WINDOWS
diff --git a/src/thread.cpp b/src/thread.cpp
index a4f13d7..7969d78 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -15,12 +15,12 @@
 #if BX_CRT_NONE
 #	include "crt0.h"
 #elif  BX_PLATFORM_ANDROID \
+	|| BX_PLATFORM_HAIKU   \
 	|| BX_PLATFORM_LINUX   \
 	|| BX_PLATFORM_IOS     \
 	|| BX_PLATFORM_OSX     \
 	|| BX_PLATFORM_PS4     \
-	|| BX_PLATFORM_RPI     \
-	|| BX_PLATFORM_HAIKU
+	|| BX_PLATFORM_RPI
 #	include <pthread.h>
 #	if defined(__FreeBSD__)
 #		include <pthread_np.h>