diff options
| author | xyzzyz <xyzzyz@chromium.org> | 2016-03-24 14:37:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 21:38:34 +0000 |
| commit | 2c19b09a75daf19a0309ae44cd2aa4558ff1115c (patch) | |
| tree | f94b0ce1383000f7c3c24f424f29c5027f2e3c44 /remoting/host | |
| parent | fd9afe9fd1841e10bf8332f65d47d626e627e85f (diff) | |
| download | chromium_src-2c19b09a75daf19a0309ae44cd2aa4558ff1115c.zip chromium_src-2c19b09a75daf19a0309ae44cd2aa4558ff1115c.tar.gz chromium_src-2c19b09a75daf19a0309ae44cd2aa4558ff1115c.tar.bz2 | |
Undef macro defined by Xlib.h, as it conflicts with Status class in protobuf
BUG=
Review URL: https://codereview.chromium.org/1827153002
Cr-Commit-Position: refs/heads/master@{#383155}
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index eac1eec..2460328 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -112,6 +112,7 @@ #if defined(OS_LINUX) #include <gtk/gtk.h> #include <X11/Xlib.h> +#undef Status // Xlib.h #defines this, which breaks protobuf headers. #include <base/linux_util.h> #include "remoting/host/audio_capturer_linux.h" #endif // defined(OS_LINUX) |