Fix MinGW build

This commit is contained in:
darkf 2014-11-28 21:38:20 -08:00
parent 2a4b698f8e
commit 459502e48c
9 changed files with 42 additions and 22 deletions

View file

@ -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