diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/log.h | |
| parent | 74d7b45d09c172bdb6dce665903537a784acb110 (diff) | |
| parent | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (diff) | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
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 @@ #include "common/msg_handler.h" #include "common/logging/log.h" -#ifdef _WIN32 +#ifdef _MSC_VER #ifndef __func__ #define __func__ __FUNCTION__ #endif @@ -39,14 +39,18 @@ #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) -#ifdef _WIN32 +#ifndef GEKKO +#ifdef _MSC_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 // _WIN32 +#else // GEKKO +#define _assert_msg_(_t_, _a_, _fmt_, ...) +#endif
\ No newline at end of file |