From 48ac6f25ff53290850a0edff0285dc3e1a350ad3 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 13 Dec 2024 00:34:16 +0800 Subject: Correctly distinguish between windows and MSVC (#5851) Partially sorts https://github.com/shader-slang/slang/issues/5843 --- source/core/slang-allocator.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/core/slang-allocator.h') diff --git a/source/core/slang-allocator.h b/source/core/slang-allocator.h index 03cfabe40..38d46c9bd 100644 --- a/source/core/slang-allocator.h +++ b/source/core/slang-allocator.h @@ -4,7 +4,7 @@ #include "slang-common.h" #include -#ifdef _MSC_VER +#if SLANG_WINDOWS_FAMILY #include #endif @@ -14,7 +14,7 @@ namespace Slang { inline void* alignedAllocate(size_t size, size_t alignment) { -#ifdef _MSC_VER +#if SLANG_WINDOWS_FAMILY return _aligned_malloc(size, alignment); #elif defined(__CYGWIN__) return aligned_alloc(alignment, size); @@ -27,7 +27,7 @@ inline void* alignedAllocate(size_t size, size_t alignment) inline void alignedDeallocate(void* ptr) { -#ifdef _MSC_VER +#if SLANG_WINDOWS_FAMILY _aligned_free(ptr); #else free(ptr); -- cgit v1.2.3