diff options
| author | Kevin Shanahan <kevin@shanahan.id.au> | 2024-12-05 19:39:26 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-05 17:09:26 +0800 |
| commit | b3778673a5598e46d81acd7f1256962c0288aa73 (patch) | |
| tree | dd48fceaf973e1170e690b3d42fdda7a50857430 /include/slang.h | |
| parent | bd50f9947905feb5199c7cfe29c640084f882199 (diff) | |
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.
Diffstat (limited to 'include/slang.h')
| -rw-r--r-- | include/slang.h | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |