dbus/message.cc - Issue 11418102: Linux: fix header includes for system protobuf.

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: dbus/message.cc

Issue 11418102: Linux: fix header includes for system protobuf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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: dbus/message.cc

diff --git a/dbus/message.cc b/dbus/message.cc

index af3c1c575550ad6f64e1eb1e6cfa9164d2925d0c..afcd9320a1db9ee9823d5fdcfe4837e8487def80 100644

--- a/dbus/message.cc

+++ b/dbus/message.cc

@@ -12,7 +12,12 @@

#include "base/string_util.h"

#include "base/stringprintf.h"

#include "dbus/object_path.h"

+#if defined(USE_SYSTEM_PROTOBUF)

+#include <google/protobuf/message_lite.h>

+#else

#include "third_party/protobuf/src/google/protobuf/message_lite.h"

+#endif

namespace {