cc/stubs/trace_event.h - Issue 11122003: [cc] Rename all cc/ filenames to Chromium style

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/stubs/trace_event.h

Issue 11122003: [cc] Rename all cc/ filenames to Chromium style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cc/stubs/trace_event.h

diff --git a/cc/stubs/trace_event.h b/cc/stubs/trace_event.h

index 638cbb270ce9b24689d5095baf174ade4f4d1a13..75587a34a178de7cb36e66331de0421a10dec76d 100644

--- a/cc/stubs/trace_event.h

+++ b/cc/stubs/trace_event.h

@@ -1,3 +1,10 @@

// 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"

« no previous file with comments | « cc/stubs/tiling_data.h ('k') | cc/stubs/unit_bezier.h » ('j') | no next file with comments »