From 293745afce226394bdff820f89799467c50d0d11 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 29 Jun 2020 13:50:07 +0200 Subject: [PATCH] Support the new MSVC preprocessor Intends to fix https://bugs.dolphin-emu.org/issues/12170. --- Source/Core/Common/MsgHandler.h | 2 +- Source/Core/VideoCommon/VideoCommon.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index b5f7efbe01..946a34dbb3 100644 --- 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 index f3d4251690..65f8d2820b 100644 --- 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__)