Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2018-03-14 09:55:04 -07:00
commit 1626d6a02e

View File

@ -39,7 +39,6 @@
#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || defined MINGW_HAS_SECURE_API #if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || defined MINGW_HAS_SECURE_API
#include <basetsd.h> #include <basetsd.h>
#define snprintf sprintf_s
#define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args)) #define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
#elif defined (solaris) #elif defined (solaris)
#define safe_vsprintf(buf,max,format,args) vsnprintf((buf), (max), (format), (args)) #define safe_vsprintf(buf,max,format,args) vsnprintf((buf), (max), (format), (args))
@ -100,6 +99,10 @@ inline long long int atoll (const char* str)
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || defined MINGW_HAS_SECURE_API
#define snprintf sprintf_s
#endif
#include "PoolAlloc.h" #include "PoolAlloc.h"
// //