mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #56 from Psybrus/master

Browse Source 
Fixed VS2015 build
This commit is contained in:
John Kessenich 2015-08-16 11:07:50 -06:00
commit fc9d2708cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/Common.h
View File

@ -37,7 +37,7 @@
#ifndef _COMMON_INCLUDED_ #ifndef _COMMON_INCLUDED_
#define _COMMON_INCLUDED_ #define _COMMON_INCLUDED_
#if defined _MSC_VER || 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 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))

2
glslang/MachineIndependent/preprocessor/PpTokens.cpp
View File

@ -80,7 +80,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// For recording and playing back the stream of tokens in a macro definition. // For recording and playing back the stream of tokens in a macro definition.
// //
#ifdef _WIN32 #if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/)
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#define snprintf sprintf_s #define snprintf sprintf_s
#endif #endif