From 1de8e54d66dbcc28578bbfe69304b0fd937ade09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sat, 3 Mar 2018 13:04:12 -0800
Subject: [PATCH] Fixed GCC+Clang errors and warnings on Linux and OSX.
---
SPIRV/GlslangToSpv.h | 2 +-
glslang/Include/Common.h | 4 ++--
glslang/Include/intermediate.h | 2 +-
hlsl/hlslParseHelper.cpp | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
index 3a4371375..f7f7cff62 100644
--- a/SPIRV/GlslangToSpv.h
+++ b/SPIRV/GlslangToSpv.h
@@ -34,7 +34,7 @@
#pragma once
-#if _MSC_VER >= 1900
+#if defined(_MSC_VER) && _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#endif
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h
index 041701774..28e8c06fd 100644
--- a/glslang/Include/Common.h
+++ b/glslang/Include/Common.h
@@ -37,7 +37,7 @@
#ifndef _COMMON_INCLUDED_
#define _COMMON_INCLUDED_
-#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>
#define snprintf sprintf_s
#define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
@@ -51,7 +51,7 @@
#define UINT_PTR uintptr_t
#endif
-#if defined(__ANDROID__) || _MSC_VER < 1700
+#if defined(__ANDROID__) || (defined(_MSC_VER) && _MSC_VER < 1700)
#include <sstream>
namespace std {
template<typename T>
diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h
index ea3e82eaf..4156ce6f0 100644
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -46,7 +46,7 @@
#ifndef __INTERMEDIATE_H
#define __INTERMEDIATE_H
-#if _MSC_VER >= 1900
+#if defined(_MSC_VER) && _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#pragma warning(disable : 5026) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted
#endif
diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp
index 2395dafe9..b7980e10a 100755
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -7446,8 +7446,8 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
}
};
- return std::abs(linearize(to2.getBasicType()) - linearize(from.getBasicType())) <
- std::abs(linearize(to1.getBasicType()) - linearize(from.getBasicType()));
+ return abs(linearize(to2.getBasicType()) - linearize(from.getBasicType())) <
+ abs(linearize(to1.getBasicType()) - linearize(from.getBasicType()));
};
// for ambiguity reporting
--
GitLab