mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Garett Bass 2013-02-26 18:17:20 -08:00
parent 1bb60c30f6
commit 0f86204daa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bgfx_p.h
View File

@ -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>