diff options
Diffstat (limited to 'lib/base/eerror.h')
| -rw-r--r-- | lib/base/eerror.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/lib/base/eerror.h b/lib/base/eerror.h index 6d38bcc7..4289ab30 100644 --- a/lib/base/eerror.h +++ b/lib/base/eerror.h @@ -23,32 +23,25 @@ #define NULL 0 #endif -#ifndef SWIG -#define CHECKFORMAT __attribute__ ((__format__(__printf__, 1, 2))) -#else -#define CHECKFORMAT +#ifdef ASSERT +#undef ASSERT #endif -void CHECKFORMAT eFatal(const char*, ...); +#ifndef SWIG -enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 }; +#define CHECKFORMAT __attribute__ ((__format__(__printf__, 1, 2))) -#ifndef SWIG extern Signal2<void, int, const std::string&> logOutput; extern int logOutputConsole; -#endif -#ifdef ASSERT -#undef ASSERT -#endif +void CHECKFORMAT eFatal(const char*, ...); +enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 }; #ifdef DEBUG void CHECKFORMAT eDebug(const char*, ...); void CHECKFORMAT eDebugNoNewLine(const char*, ...); void CHECKFORMAT eWarning(const char*, ...); -#ifndef SWIG #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); } -#endif #ifdef MEMLEAK_CHECK typedef struct @@ -134,7 +127,7 @@ void DumpUnfreed(); #endif // MEMLEAK_CHECK -#else +#else // DEBUG inline void eDebug(const char* fmt, ...) { } @@ -149,7 +142,10 @@ void DumpUnfreed(); #define ASSERT(x) do { } while (0) #endif //DEBUG -void ePythonOutput(const char *); void eWriteCrashdump(); +#endif // SWIG + +void ePythonOutput(const char *); + #endif // __E_ERROR__ |