Remove the checks.h dependence on logging.h in a standalone build.
logging.h apparently drags in a lot of undesirable dependencies. It was
only required for the trivial LogMessageVoidify; simply add an
identical FatalMessageVoidify instead.
Keep the include in a Chromium build to still have the override
mechanism use Chromium's macros.
Bonus: Add the missing DCHECK_GT (noticed by bercic).
R=kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17259004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7031 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/base/checks.cc b/base/checks.cc
index 5de1a80..9694b93 100644
--- a/base/checks.cc
+++ b/base/checks.cc
@@ -13,22 +13,19 @@
// Use the C++ version to provide __GLIBCXX__.
#include <cstdio>
+#include <cstdarg>
#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
#include <cxxabi.h>
#include <execinfo.h>
#endif
-#if defined(ANDROID)
+#if defined(WEBRTC_ANDROID)
#define LOG_TAG "rtc"
#include <android/log.h> // NOLINT
#endif
-#include <iostream>
-
#include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
-#include "webrtc/base/logging.h"
#if defined(_MSC_VER)
// Warning C4722: destructor never returns, potential memory leak.
@@ -59,7 +56,7 @@
void DumpBacktrace() {
#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
void* trace[100];
- int size = backtrace(trace, ARRAY_SIZE(trace));
+ int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
char** symbols = backtrace_symbols(trace, size);
PrintError("\n==== C stack trace ===============================\n\n");
if (size == 0) {
