summaryrefslogtreecommitdiff
path: root/src/common/log.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/log.h')
-rw-r--r--src/common/log.h8
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
104#endif // loglevel 104#endif // loglevel
105#endif // logging 105#endif // logging
106 106
107#ifdef _WIN32 107#ifdef MSVC_VER
108#ifndef __func__ 108#ifndef __func__
109#define __func__ __FUNCTION__ 109#define __func__ __FUNCTION__
110#endif 110#endif
@@ -149,17 +149,17 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
149#define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) 149#define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
150 150
151#ifndef GEKKO 151#ifndef GEKKO
152#ifdef _WIN32 152#ifdef MSVC_VER
153#define _assert_msg_(_t_, _a_, _fmt_, ...) \ 153#define _assert_msg_(_t_, _a_, _fmt_, ...) \
154 if (!(_a_)) {\ 154 if (!(_a_)) {\
155 if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ 155 if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \
156 } 156 }
157#else // not win32 157#else // not msvc
158#define _assert_msg_(_t_, _a_, _fmt_, ...) \ 158#define _assert_msg_(_t_, _a_, _fmt_, ...) \
159 if (!(_a_)) {\ 159 if (!(_a_)) {\
160 if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \ 160 if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \
161 } 161 }
162#endif // WIN32 162#endif // MSVC_VER
163#else // GEKKO 163#else // GEKKO
164#define _assert_msg_(_t_, _a_, _fmt_, ...) 164#define _assert_msg_(_t_, _a_, _fmt_, ...)
165#endif 165#endif