diff options
Diffstat (limited to 'src/common/log.h')
| -rw-r--r-- | src/common/log.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/log.h b/src/common/log.h index 96d97249f..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 _WIN32 | 11 | #ifdef _MSC_VER |
| 12 | #ifndef __func__ | 12 | #ifndef __func__ |
| 13 | #define __func__ __FUNCTION__ | 13 | #define __func__ __FUNCTION__ |
| 14 | #endif | 14 | #endif |
| @@ -39,14 +39,18 @@ | |||
| 39 | 39 | ||
| 40 | #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) | 40 | #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) |
| 41 | 41 | ||
| 42 | #ifdef _WIN32 | 42 | #ifndef GEKKO |
| 43 | #ifdef _MSC_VER | ||
| 43 | #define _assert_msg_(_t_, _a_, _fmt_, ...) \ | 44 | #define _assert_msg_(_t_, _a_, _fmt_, ...) \ |
| 44 | if (!(_a_)) {\ | 45 | if (!(_a_)) {\ |
| 45 | if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ | 46 | if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ |
| 46 | } | 47 | } |
| 47 | #else // not win32 | 48 | #else // not msvc |
| 48 | #define _assert_msg_(_t_, _a_, _fmt_, ...) \ | 49 | #define _assert_msg_(_t_, _a_, _fmt_, ...) \ |
| 49 | if (!(_a_)) {\ | 50 | if (!(_a_)) {\ |
| 50 | if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \ | 51 | if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \ |
| 51 | } | 52 | } |
| 52 | #endif // WIN32 | 53 | #endif // _WIN32 |
| 54 | #else // GEKKO | ||
| 55 | #define _assert_msg_(_t_, _a_, _fmt_, ...) | ||
| 56 | #endif \ No newline at end of file | ||