ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8913 from JosJuice/msvc-preprocessor 

Support the new MSVC preprocessor
This commit is contained in:
LC 2020-06-30 04:34:10 -04:00 committed by GitHub
parent 5792881eeb 293745afce
commit 4ff560a6e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/MsgHandler.h
View File

@ -32,7 +32,7 @@ bool MsgAlert(bool yes_no, MsgType style, const char* format, ...)
void SetEnableAlert(bool enable); void SetEnableAlert(bool enable);
} // namespace Common } // namespace Common
#ifdef _WIN32 #if defined(_WIN32) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL == 1)
#define SuccessAlert(format, ...) \ #define SuccessAlert(format, ...) \
Common::MsgAlert(false, Common::MsgType::Information, format, __VA_ARGS__) Common::MsgAlert(false, Common::MsgType::Information, format, __VA_ARGS__)

2
Source/Core/VideoCommon/VideoCommon.h
View File

@ -20,7 +20,7 @@ constexpr u32 MAX_XFB_WIDTH = 720;
// that are next to each other in memory (TODO: handle that situation). // that are next to each other in memory (TODO: handle that situation).
constexpr u32 MAX_XFB_HEIGHT = 576; 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__) #define PRIM_LOG(...) DEBUG_LOG(VIDEO, __VA_ARGS__)
#else #else
#define PRIM_LOG(...) DEBUG_LOG(VIDEO, ##__VA_ARGS__) #define PRIM_LOG(...) DEBUG_LOG(VIDEO, ##__VA_ARGS__)