Merge pull request #1825 from Zeno-/control_key_cache

[dragonfireclient.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 1532be824a2918a048e5dc592078fb2dead14c5d..ba2e8704ebd1cc7c892dcec67618c6009f75035a 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -72,6 +72,14 @@ extern std::ostream dstream;
 extern std::ostream dstream_no_stderr;
 extern Nullstream dummyout;
 
+/*
+       Include assert.h and immediately undef assert so that it can't override
+       our assert later on. leveldb/slice.h is a notable offender.
+*/
+
+#include <assert.h>
+#undef assert
+
 /*
        Assert
 */