diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index f746f958be1cfc4c15d31aaa983f02d612b0d299..c7567baa92ecce60ff334b878a9b2eeb066ca3a4 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 10ce307dc2561c08be3736ac91b211ce7c705f22..85a907d869d8c34df238f381b4efb7c87e1e7ed8 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