summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 01:34:54 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 01:34:54 +0000
commitd8961a2693062bca1a6a5c899c76ac4ceb4a59f4 (patch)
treeb8753c6841f206e9259c74ca994697098d014602 /dbus
parent2e805023bf3ea711358e72ce61cf34a3c8f4db3a (diff)
downloadchromium_src-d8961a2693062bca1a6a5c899c76ac4ceb4a59f4.zip
chromium_src-d8961a2693062bca1a6a5c899c76ac4ceb4a59f4.tar.gz
chromium_src-d8961a2693062bca1a6a5c899c76ac4ceb4a59f4.tar.bz2
Linux: fix header includes for system protobuf.
BUG=157155 Review URL: https://chromiumcodereview.appspot.com/11418102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus')
-rw-r--r--dbus/message.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/dbus/message.cc b/dbus/message.cc
index af3c1c5..afcd932 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 {