From c7feb72a69b5399ae5d9207202f9fd08e811c88d Mon Sep 17 00:00:00 2001
From: IntelOrca <ted@brambles.org>
Date: Sun, 10 Jan 2016 22:06:54 +0000
Subject: [PATCH] move compiler normalisation to rct2.h

---
 src/core/Stopwatch.cpp  |  3 +++
 src/platform/platform.h | 29 -----------------------------
 src/rct2.h              | 29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/core/Stopwatch.cpp b/src/core/Stopwatch.cpp
index 8a11894d37..18adb09742 100644
--- a/src/core/Stopwatch.cpp
+++ b/src/core/Stopwatch.cpp
@@ -1,4 +1,7 @@
 #ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include "../platform/platform.h"
diff --git a/src/platform/platform.h b/src/platform/platform.h
index 8b2b59acca..1311a9cb36 100644
--- a/src/platform/platform.h
+++ b/src/platform/platform.h
@@ -169,11 +169,6 @@ bool platform_check_steam_overlay_attached();
 
 datetime64 platform_get_datetime_now_utc();
 
-// BSD and OS X has MAP_ANON instead of MAP_ANONYMOUS
-#ifndef MAP_ANONYMOUS
-	#define MAP_ANONYMOUS MAP_ANON
-#endif
-
 // Windows specific definitions
 #ifdef _WIN32
 	#ifndef WIN32_LEAN_AND_MEAN
@@ -185,28 +180,4 @@ datetime64 platform_get_datetime_now_utc();
 	HWND windows_get_window_handle();
 #endif // _WIN32
 
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-#include <unistd.h>
-#define STUB() log_warning("Function %s at %s:%d is a stub.\n", __PRETTY_FUNCTION__, __FILE__, __LINE__)
-#define _strcmpi _stricmp
-#define _stricmp(x, y) strcasecmp((x), (y))
-#define _strnicmp(x, y, n) strncasecmp((x), (y), (n))
-#define _strdup(x) strdup((x))
-
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define RCT2_ENDIANESS __ORDER_LITTLE_ENDIAN__
-#define LOBYTE(w) ((uint8_t)(w))
-#define HIBYTE(w) ((uint8_t)(((uint16_t)(w)>>8)&0xFF))
-#endif // __BYTE_ORDER__
-
-#ifndef RCT2_ENDIANESS
-#error Unknown endianess!
-#endif // RCT2_ENDIANESS
-
-#endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-
-#if !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
-	char *strndup(const char *src, size_t size);
-#endif // !(POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
-
 #endif
diff --git a/src/rct2.h b/src/rct2.h
index d520c8f7ba..5b949c3150 100644
--- a/src/rct2.h
+++ b/src/rct2.h
@@ -111,6 +111,35 @@ typedef utf16* utf16string;
 #pragma pack(1)
 #endif
 
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+#include <unistd.h>
+#define STUB() log_warning("Function %s at %s:%d is a stub.\n", __PRETTY_FUNCTION__, __FILE__, __LINE__)
+#define _strcmpi _stricmp
+#define _stricmp(x, y) strcasecmp((x), (y))
+#define _strnicmp(x, y, n) strncasecmp((x), (y), (n))
+#define _strdup(x) strdup((x))
+
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define RCT2_ENDIANESS __ORDER_LITTLE_ENDIAN__
+#define LOBYTE(w) ((uint8_t)(w))
+#define HIBYTE(w) ((uint8_t)(((uint16_t)(w)>>8)&0xFF))
+#endif // __BYTE_ORDER__
+
+#ifndef RCT2_ENDIANESS
+#error Unknown endianess!
+#endif // RCT2_ENDIANESS
+
+#endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+
+#if !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+	char *strndup(const char *src, size_t size);
+#endif // !(POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+
+// BSD and OS X has MAP_ANON instead of MAP_ANONYMOUS
+#ifndef MAP_ANONYMOUS
+	#define MAP_ANONYMOUS MAP_ANON
+#endif
+
 #include "version.h"
 
 #define OPENRCT2_MASTER_SERVER_URL	"https://servers.openrct2.website"