diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
| commit | e7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch) | |
| tree | 289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/stubs | |
| parent | bc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff) | |
| download | chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.zip chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.gz chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.bz2 | |
Revert "cc: Switch to Chromium DCHECKs LOGs"
This reverts commit 162296. (https://chromiumcodereview.appspot.com/11048044)
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11196014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/stubs')
| -rw-r--r-- | cc/stubs/config.h | 17 | ||||
| -rw-r--r-- | cc/stubs/trace_event.h | 5 |
2 files changed, 5 insertions, 17 deletions
diff --git a/cc/stubs/config.h b/cc/stubs/config.h deleted file mode 100644 index 3b2b573..0000000 --- a/cc/stubs/config.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CC_STUBS_CONFIG_H_ -#define CC_STUBS_CONFIG_H_ - -#if INSIDE_WEBKIT_BUILD -#include "Source/WTF/config.h" -#else -#include "third_party/WebKit/Source/WTF/config.h" -#endif - -#include <wtf/Assertions.h> -#undef LOG - -#endif diff --git a/cc/stubs/trace_event.h b/cc/stubs/trace_event.h index 811d6b9..75587a3 100644 --- a/cc/stubs/trace_event.h +++ b/cc/stubs/trace_event.h @@ -2,4 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// Chromium's LOG() macro collides with one from WTF. +#ifdef LOG +#undef LOG +#endif + #include "base/debug/trace_event.h" |