From 77d04598d37facab359f6473d26c71d20b14d480 Mon Sep 17 00:00:00 2001
From: St0fF <st0ff.npl@gmail.com>
Date: Mon, 9 Apr 2018 17:37:01 +0200
Subject: [PATCH] fix VS2012 compile issues
small fixes needed to compile under Win8.1/VS2012/static_lib
---
glslang/Include/Common.h | 25 +++++++++++----------
glslang/MachineIndependent/Intermediate.cpp | 1 +
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h
index f2fb10bf3..5fe0f2705 100644
--- a/glslang/Include/Common.h
+++ b/glslang/Include/Common.h
@@ -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)
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 9e5beaca9..0333e5d01 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -47,6 +47,7 @@
#include <cfloat>
#include <utility>
+#include <tuple>
namespace glslang {
--
GitLab