From 8ae09e81e0617168d79501acb2698b3c5dc55a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Wed, 23 Aug 2017 11:06:34 +0200
Subject: [PATCH] Undef Status symbol to address conflict between X11 and
 protobuf

---
 .../android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp b/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp
index fdcf451..c567efd 100644
--- a/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp
+++ b/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp
@@ -25,6 +25,10 @@
 #include <string.h>
 #include <X11/Xlib.h>
 #include <GL/glx.h>
+#if defined(Status)
+// undef to address conflict between X11 symbol and protobuf
+#undef Status
+#endif
 
 namespace {