Fixed SAL define and MinGW standard library argument collision.

This commit is contained in:
Branimir Karadžić 2014-08-20 21:48:17 -07:00
parent 47d859958b
commit ed883bec36

View file

@ -3,6 +3,9 @@
* License: http://www.opensource.org/licenses/BSD-2-Clause * License: http://www.opensource.org/licenses/BSD-2-Clause
*/ */
#include <vector>
#include <string>
#include "common.h" #include "common.h"
#include "bgfx_utils.h" #include "bgfx_utils.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
@ -11,9 +14,6 @@
#include <bx/readerwriter.h> #include <bx/readerwriter.h>
#include <bx/string.h> #include <bx/string.h>
#include <vector>
#include <string>
static bool s_flipV = false; static bool s_flipV = false;
static float s_texelHalf = 0.0f; static float s_texelHalf = 0.0f;