summaryrefslogtreecommitdiff
path: root/chromium/base/logging.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/base/logging.cc')
-rw-r--r--chromium/base/logging.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/base/logging.cc b/chromium/base/logging.cc
index fdd86299aa4..2da71c73819 100644
--- a/chromium/base/logging.cc
+++ b/chromium/base/logging.cc
@@ -8,16 +8,20 @@
// build time. Try not to raise this limit unless absolutely necessary. See
// https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
#ifndef NACL_TC_REV
-#pragma clang max_tokens_here 370000
+#pragma clang max_tokens_here 350000
#endif // NACL_TC_REV
+#ifdef BASE_CHECK_H_
+#error "logging.h should not include check.h"
+#endif
+
#include <limits.h>
#include <stdint.h>
#include "base/pending_task.h"
#include "base/stl_util.h"
#include "base/task/common/task_annotator.h"
-#include "base/trace_event/trace_event.h"
+#include "base/trace_event/base_tracing.h"
#include "build/build_config.h"
#if defined(OS_WIN)