From 377bccb143941ec4931e6aed9ac07752ccefb979 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 7 Feb 2019 23:28:37 -0700 Subject: [PATCH] Build: Fix #1665: remove __fastcall --- glslang/MachineIndependent/ShaderLang.cpp | 2 +- glslang/Public/ShaderLang.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index 3d93aa29..d6441ef0 100755 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -1335,7 +1335,7 @@ void ShDestruct(ShHandle handle) // // Cleanup symbol tables // -int __fastcall ShFinalize() +int ShFinalize() { glslang::GetGlobalLock(); --NumberOfClients; diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h index d73021c4..26bf8bf0 100755 --- a/glslang/Public/ShaderLang.h +++ b/glslang/Public/ShaderLang.h @@ -53,9 +53,6 @@ #define SH_IMPORT_EXPORT #else #define SH_IMPORT_EXPORT -#ifndef __fastcall -#define __fastcall -#endif #define C_DECL #endif @@ -83,7 +80,7 @@ SH_IMPORT_EXPORT int ShInitialize(); // // Call this at process shutdown to clean up memory. // -SH_IMPORT_EXPORT int __fastcall ShFinalize(); +SH_IMPORT_EXPORT int ShFinalize(); // // Types of languages the compiler can consume. -- 2.34.1