From 0f86204daa4fa28b4762f30e621e7d8819c8fc63 Mon Sep 17 00:00:00 2001
From: Garett Bass <gtbass@studiotekne.com>
Date: Tue, 26 Feb 2013 18:17:20 -0800
Subject: [PATCH] Fix conflict between sal.h and MinGW STL

Moved #include<windows.h> after #include <string> to avoid conflicts
between sal.h and MinGW STL usage of __in and __out as function
parameters.
---
 src/bgfx_p.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 76222bd49..e4bd57d92 100755
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -66,13 +66,6 @@ extern void dbgPrintfData(const void* _data, uint32_t _size, const char* _format
 #include <bx/uint32_t.h>
 #include <bx/readerwriter.h>
 
-#if BX_PLATFORM_WINDOWS
-#	include <windows.h>
-#elif BX_PLATFORM_XBOX360
-#	include <malloc.h>
-#	include <xtl.h>
-#endif // BX_PLATFORM_*
-
 #include "dds.h"
 
 #define BGFX_CHUNK_MAGIC_FSH BX_MAKEFOURCC('F', 'S', 'H', 0x1)
@@ -107,6 +100,13 @@ namespace stl {
 #endif // BGFX_CONFIG_USE_TINYSTL
 #include <list>
 
+#if BX_PLATFORM_WINDOWS
+#	include <windows.h>
+#elif BX_PLATFORM_XBOX360
+#	include <malloc.h>
+#	include <xtl.h>
+#endif // BX_PLATFORM_*
+
 #include "config.h"
 
 #include <bx/cpu.h>