Bug 716544 - Include assert.h from logging.h. r=cjones

bnoordhuis · Mar 13, 2012 · d7eff8b · d7eff8b
1 parent 55ffdbc
commit d7eff8b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/ipc/chromium/src/base/logging.h b/ipc/chromium/src/base/logging.h
@@ -5,6 +5,7 @@
 #ifndef BASE_LOGGING_H_
 #define BASE_LOGGING_H_
 
+#include <assert.h>
 #include <string>
 #include <cstring>
 
@@ -14,8 +15,6 @@
 // Replace the Chromium logging code with NSPR-based logging code and
 // some C++ wrappers to emulate std::ostream
 
-#define ERROR 0
-
 namespace mozilla {
 
 enum LogSeverity {
@@ -100,8 +99,8 @@ const mozilla::EmptyLog& operator <<(const mozilla::EmptyLog& log, const T&)
 #define DCHECK(condition) while (false && (condition)) mozilla::EmptyLog()
 #endif
 
-#define LOG_ASSERT(cond) CHECK(ERROR)
-#define DLOG_ASSERT(cond) DCHECK(ERROR)
+#define LOG_ASSERT(cond) CHECK(0)
+#define DLOG_ASSERT(cond) DCHECK(0)
 
 #define NOTREACHED() LOG(ERROR)
 #define NOTIMPLEMENTED() LOG(ERROR)