X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0103839d01b8762a836265695cee4efbecc057da..dc4073de1957503fcd2a7eed055c55a2265d1212:/lib/base/eerror.h

diff --git a/lib/base/eerror.h b/lib/base/eerror.h
index 4289ab30..2d4e9790 100644
--- a/lib/base/eerror.h
+++ b/lib/base/eerror.h
@@ -17,33 +17,6 @@
 #include <string>
 #include <new>
 #include <cxxabi.h>
-#endif // MEMLEAK_CHECK
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifdef ASSERT
-#undef ASSERT
-#endif
-
-#ifndef SWIG
-
-#define CHECKFORMAT __attribute__ ((__format__(__printf__, 1, 2)))
-
-extern Signal2<void, int, const std::string&> logOutput;
-extern int logOutputConsole;
-
-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*, ...);
-    #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); }
-
-#ifdef MEMLEAK_CHECK
 typedef struct
 {
 	unsigned int address;
@@ -127,6 +100,29 @@ void DumpUnfreed();
 
 #endif // MEMLEAK_CHECK
 
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef ASSERT
+#undef ASSERT
+#endif
+
+#ifndef SWIG
+
+#define CHECKFORMAT __attribute__ ((__format__(__printf__, 1, 2)))
+
+extern Signal2<void, int, const std::string&> logOutput;
+extern int logOutputConsole;
+
+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*, ...);
+    #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); }
 #else  // DEBUG
     inline void eDebug(const char* fmt, ...)
     {
@@ -139,13 +135,17 @@ void DumpUnfreed();
     inline void eWarning(const char* fmt, ...)
     {
     }
-    #define ASSERT(x) do { } while (0)
+    #define ASSERT(x) do { x; } while (0)
 #endif //DEBUG
 
 void eWriteCrashdump();
 
 #endif // SWIG
 
-void ePythonOutput(const char *);
+#ifndef DEBUG
+inline void ePythonOutput(const char *)
+{
+}
+#endif
 
 #endif // __E_ERROR__