Skip to content

G
glslang
Commit 77d04598 by St0fF
Options

fix VS2012 compile issues

small fixes needed to compile under Win8.1/VS2012/static_lib
parent b92ce60f
Showing with 11 additions and 9 deletions
glslang/Include/Common.h
...@@ -67,18 +67,19 @@ std::string to_string(const T& val) { ...@@ -67,18 +67,19 @@ std::string to_string(const T& val) {
#endif #endif
#if defined(_MSC_VER) && _MSC_VER < 1800 #if defined(_MSC_VER) && _MSC_VER < 1800
inline long long int strtoll (const char* str, char** endptr, int base) #include <stdlib.h>
{ inline long long int strtoll (const char* str, char** endptr, int base)
{
return _strtoi64(str, endptr, base); return _strtoi64(str, endptr, base);
} }
inline unsigned long long int strtoull (const char* str, char** endptr, int base) inline unsigned long long int strtoull (const char* str, char** endptr, int base)
{ {
return _strtoui64(str, endptr, base); return _strtoui64(str, endptr, base);
} }
inline long long int atoll (const char* str) inline long long int atoll (const char* str)
{ {
return strtoll(str, NULL, 10); return strtoll(str, NULL, 10);
} }
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
......
glslang/MachineIndependent/Intermediate.cpp
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <cfloat> #include <cfloat>
#include <utility> #include <utility>
#include <tuple>
namespace glslang { namespace glslang {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment