remoting/protocol/message_decoder.h - 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: remoting/protocol/message_decoder.h

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: remoting/protocol/message_decoder.h

diff --git a/remoting/protocol/message_decoder.h b/remoting/protocol/message_decoder.h

index 83841414bb8c56e5e16a3ffd54cb523cacb94155..70a1a073912f8c3cd88c357b99cef33f6ef23620 100644

--- a/remoting/protocol/message_decoder.h

+++ b/remoting/protocol/message_decoder.h

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

#include "base/memory/ref_counted.h"

#include "net/base/io_buffer.h"

#include "remoting/base/compound_buffer.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 remoting {

namespace protocol {

« no previous file with comments | « dbus/message.cc ('k') | remoting/protocol/util.h » ('j') | no next file with comments »