fix

[enigma2.git] / lib / base / eerror.h

diff --git a/lib/base/eerror.h b/lib/base/eerror.h
index 6d38bcc74ec723ae2034e9f2ad22810ae4e1814d..5a66b31e9735a99f3939a3c928765463c287e53b 100644 (file)
--- a/lib/base/eerror.h
+++ b/lib/base/eerror.h
@@ -17,40 +17,6 @@
 #include <string>
 #include <new>
 #include <cxxabi.h>
-#endif // MEMLEAK_CHECK
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef SWIG
-#define CHECKFORMAT __attribute__ ((__format__(__printf__, 1, 2)))
-#else
-#define CHECKFORMAT
-#endif
-
-void CHECKFORMAT eFatal(const char*, ...);
-
-enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
-
-#ifndef SWIG
-extern Signal2<void, int, const std::string&> logOutput;
-extern int logOutputConsole;
-#endif
-
-#ifdef ASSERT
-#undef ASSERT
-#endif
-
-#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
 {
        unsigned int address;
@@ -134,7 +100,30 @@ void DumpUnfreed();
 
 #endif // MEMLEAK_CHECK
 
-#else
+#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, ...)
     {
     }
@@ -146,10 +135,13 @@ void DumpUnfreed();
     inline void eWarning(const char* fmt, ...)
     {
     }
-    #define ASSERT(x) do { } while (0)
+    #define ASSERT(x) do { x; } while (0)
 #endif //DEBUG
 
-void ePythonOutput(const char *);
 void eWriteCrashdump();
 
+#endif // SWIG
+
+void ePythonOutput(const char *);
+
 #endif // __E_ERROR__