Merge pull request #8913 from JosJuice/msvc-preprocessor

Support the new MSVC preprocessor
dolphin-emu · Jun 30, 2020 · 4ff560a · 4ff560a
2 parents 5792881 + 293745a
commit 4ff560a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h
@@ -32,7 +32,7 @@ bool MsgAlert(bool yes_no, MsgType style, const char* format, ...)
 void SetEnableAlert(bool enable);
 }  // namespace Common
 
-#ifdef _WIN32
+#if defined(_WIN32) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL == 1)
 #define SuccessAlert(format, ...)                                                                  \
   Common::MsgAlert(false, Common::MsgType::Information, format, __VA_ARGS__)
 

diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h
@@ -20,7 +20,7 @@ constexpr u32 MAX_XFB_WIDTH = 720;
 // that are next to each other in memory (TODO: handle that situation).
 constexpr u32 MAX_XFB_HEIGHT = 576;
 
-#ifdef _WIN32
+#if defined(_WIN32) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL == 1)
 #define PRIM_LOG(...) DEBUG_LOG(VIDEO, __VA_ARGS__)
 #else
 #define PRIM_LOG(...) DEBUG_LOG(VIDEO, ##__VA_ARGS__)