From a613efd4912a14f2b34ae3bade0753b6e2995979 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 5 Mar 2024 16:47:17 -0500
Subject: [PATCH] Use new MSVC preprocessor
---
indra/cmake/00-Common.cmake | 1 +
indra/llcommon/llpreprocessor.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index f746f958be1..c7567baa92e 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -97,6 +97,7 @@ if (WINDOWS)
/W3
/c
/Zc:__cplusplus
+ /Zc:preprocessor
/Zc:char8_t-
/nologo
)
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 10ce307dc25..85a907d869d 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -198,7 +198,7 @@
#define LL_TO_STRING_HELPER(x) #x
#define LL_TO_STRING(x) LL_TO_STRING_HELPER(x)
-#define LL_TO_WSTRING_HELPER(x) L#x
+#define LL_TO_WSTRING_HELPER(x) L## #x
#define LL_TO_WSTRING(x) LL_TO_WSTRING_HELPER(x)
#define LL_FILE_LINENO_MSG(msg) __FILE__ "(" LL_TO_STRING(__LINE__) ") : " msg
#define LL_GLUE_IMPL(x, y) x##y
--
GitLab