diff options
| author |  darkf | 2014-12-29 19:59:14 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 20:12:03 -0800 |
| commit | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (patch) | |
| tree | 206a1417e59815789eca81249734b0eb5497d5e3 /src/common/log.h | |
| parent | Fix merge conflicts (diff) | |
| download | yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.gz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.xz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.zip | |
Fix MSVC-related #defines and add CMakeLists comment
Diffstat (limited to 'src/common/log.h')
| -rw-r--r-- | src/common/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/log.h b/src/common/log.h index c6a023552..667f2fbb9 100644 --- a/src/common/log.h +++ b/src/common/log.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include "common/msg_handler.h" | 8 | #include "common/msg_handler.h" |
| 9 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 10 | 10 | ||
| 11 | #ifdef MSVC_VER | 11 | #ifdef _MSC_VER |
| 12 | #ifndef __func__ | 12 | #ifndef __func__ |
| 13 | #define __func__ __FUNCTION__ | 13 | #define __func__ __FUNCTION__ |
| 14 | #endif | 14 | #endif |
| @@ -40,7 +40,7 @@ | |||
| 40 | #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) | 40 | #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) |
| 41 | 41 | ||
| 42 | #ifndef GEKKO | 42 | #ifndef GEKKO |
| 43 | #ifdef _WIN32 | 43 | #ifdef _MSC_VER |
| 44 | #define _assert_msg_(_t_, _a_, _fmt_, ...) \ | 44 | #define _assert_msg_(_t_, _a_, _fmt_, ...) \ |
| 45 | if (!(_a_)) {\ | 45 | if (!(_a_)) {\ |
| 46 | if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ | 46 | if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ |