From b3778673a5598e46d81acd7f1256962c0288aa73 Mon Sep 17 00:00:00 2001 From: Kevin Shanahan Date: Thu, 5 Dec 2024 19:39:26 +1030 Subject: Fix compiler warning when using slang.h with gcc/clang on Windows (#5766) The macros SLANG_NO_INLINE, SLANG_FORCE_INLINE, SLANG_BREAKPOINT and SLANG_ALIGN_OF end up getting defined twice when using g++ or clang++ with the slang.h header on Windows. Change the VC specific definitions to depend on SLANG_VC instead of SLANG_MICROSOFT_FAMILY. --- include/slang.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/slang.h b/include/slang.h index 3816ab70e..ee9fb7650 100644 --- a/include/slang.h +++ b/include/slang.h @@ -273,7 +273,7 @@ convention for interface methods. #endif // Microsoft VC specific -#if SLANG_MICROSOFT_FAMILY +#if SLANG_VC #define SLANG_NO_INLINE __declspec(noinline) #define SLANG_FORCE_INLINE __forceinline #define SLANG_BREAKPOINT(id) __debugbreak(); -- cgit v1.2.3