diff options
| author | darkf <lw9k123@gmail.com> | 2014-11-29 06:38:20 +0100 |
|---|---|---|
| committer | darkf <lw9k123@gmail.com> | 2014-11-29 06:38:20 +0100 |
| commit | 459502e48ccb6607e531112e7ae89f62b75023c8 (patch) | |
| tree | 491c2a24f1496d4abab0d3339e559b9facc74265 /src/common/log.h | |
| parent | Merge pull request #223 from linkmauve/remove-thread (diff) | |
| download | yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.gz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.bz2 yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.lz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.xz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.zst yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/common/log.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/log.h b/src/common/log.h index 14ad98c08..4c96ef0a6 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -104,7 +104,7 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int #endif // loglevel #endif // logging -#ifdef _WIN32 +#ifdef MSVC_VER #ifndef __func__ #define __func__ __FUNCTION__ #endif @@ -149,17 +149,17 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) #ifndef GEKKO -#ifdef _WIN32 +#ifdef MSVC_VER #define _assert_msg_(_t_, _a_, _fmt_, ...) \ if (!(_a_)) {\ if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ } -#else // not win32 +#else // not msvc #define _assert_msg_(_t_, _a_, _fmt_, ...) \ if (!(_a_)) {\ if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \ } -#endif // WIN32 +#endif // MSVC_VER #else // GEKKO #define _assert_msg_(_t_, _a_, _fmt_, ...) #endif |