BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1341 from St0fF-NPL-ToM/master

Browse source 
fix VS2012 compile issues
This commit is contained in:
John Kessenich 2018-04-10 14:16:39 -06:00 • committed by GitHub
commit c3a370db1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
glslang/Include/Common.h
View file

@ -67,18 +67,19 @@ std::string to_string(const T& val) {
#endif
#if defined(_MSC_VER) && _MSC_VER < 1800
inline long long int strtoll (const char* str, char** endptr, int base)
{
return _strtoi64(str, endptr, base);
}
inline unsigned long long int strtoull (const char* str, char** endptr, int base)
{
return _strtoui64(str, endptr, base);
}
inline long long int atoll (const char* str)
{
return strtoll(str, NULL, 10);
}
#include <stdlib.h>
inline long long int strtoll (const char* str, char** endptr, int base)
{
return _strtoi64(str, endptr, base);
}
inline unsigned long long int strtoull (const char* str, char** endptr, int base)
{
return _strtoui64(str, endptr, base);
}
inline long long int atoll (const char* str)
{
return strtoll(str, NULL, 10);
}
#endif
#if defined(_MSC_VER)

1
glslang/MachineIndependent/Intermediate.cpp
View file

@ -47,6 +47,7 @@
#include <cfloat>
#include <utility>
#include <tuple>
namespace glslang {