From 48ac6f25ff53290850a0edff0285dc3e1a350ad3 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
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/compiler-core/windows/slang-win-visual-studio-util.cpp | 6 ++++--
 source/core/slang-allocator.h                                 | 6 +++---
 source/core/slang-platform.cpp                                | 2 +-
 source/core/slang-secure-crt.h                                | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'source')

diff --git a/source/compiler-core/windows/slang-win-visual-studio-util.cpp b/source/compiler-core/windows/slang-win-visual-studio-util.cpp
index e97a998d6..21830bd47 100644
--- a/source/compiler-core/windows/slang-win-visual-studio-util.cpp
+++ b/source/compiler-core/windows/slang-win-visual-studio-util.cpp
@@ -69,7 +69,7 @@ static SlangResult _readRegistryKey(const char* path, const char* keyName, Strin
 
 // Make easier to set up the array
 
-static DownstreamCompilerMatchVersion _makeVersion(int main)
+[[maybe_unused]] static DownstreamCompilerMatchVersion _makeVersion(int main)
 {
     DownstreamCompilerMatchVersion version;
     version.type = SLANG_PASS_THROUGH_VISUAL_STUDIO;
@@ -77,7 +77,7 @@ static DownstreamCompilerMatchVersion _makeVersion(int main)
     return version;
 }
 
-static DownstreamCompilerMatchVersion _makeVersion(int main, int dot)
+[[maybe_unused]] static DownstreamCompilerMatchVersion _makeVersion(int main, int dot)
 {
     DownstreamCompilerMatchVersion version;
     version.type = SLANG_PASS_THROUGH_VISUAL_STUDIO;
@@ -149,6 +149,7 @@ static SlangResult _parseVersion(UnownedStringSlice versionString, SemanticVersi
 
 /* static */ DownstreamCompilerMatchVersion WinVisualStudioUtil::getCompiledVersion()
 {
+#ifdef _MSC_VER
     // Get the version of visual studio used to compile this source
     // Not const, because otherwise we get an warning/error about constant expression...
     uint32_t version = _MSC_VER;
@@ -247,6 +248,7 @@ static SlangResult _parseVersion(UnownedStringSlice versionString, SemanticVersi
             SLANG_PASS_THROUGH_VISUAL_STUDIO,
             MatchSemanticVersion::makeFuture());
     }
+#endif
 
     // Unknown version
     return DownstreamCompilerMatchVersion(SLANG_PASS_THROUGH_VISUAL_STUDIO, MatchSemanticVersion());
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 <stdlib.h>
-#ifdef _MSC_VER
+#if SLANG_WINDOWS_FAMILY
 #include <malloc.h>
 #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);
diff --git a/source/core/slang-platform.cpp b/source/core/slang-platform.cpp
index 79b883e39..51f6b97c7 100644
--- a/source/core/slang-platform.cpp
+++ b/source/core/slang-platform.cpp
@@ -157,7 +157,7 @@ SLANG_COMPILE_TIME_ASSERT(E_OUTOFMEMORY == SLANG_E_OUT_OF_MEMORY);
 /* static */ void* SharedLibrary::findSymbolAddressByName(Handle handle, char const* name)
 {
     SLANG_ASSERT(handle);
-    return GetProcAddress((HMODULE)handle, name);
+    return reinterpret_cast<void*>(GetProcAddress((HMODULE)handle, name));
 }
 
 /* static */ void SharedLibrary::appendPlatformFileName(
diff --git a/source/core/slang-secure-crt.h b/source/core/slang-secure-crt.h
index 57e38f0dd..607fc7a73 100644
--- a/source/core/slang-secure-crt.h
+++ b/source/core/slang-secure-crt.h
@@ -1,4 +1,4 @@
-#ifndef _MSC_VER
+#ifndef _WIN32
 #ifndef SLANG_CORE_SECURE_CRT_H
 #define SLANG_CORE_SECURE_CRT_H
 #include <assert.h>
-- 
cgit v1.2.3