jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undef Status symbol to address conflict between X11 and protobuf

Browse source
This commit is contained in:
Alfonso Sánchez-Beato 2017-08-23 11:06:34 +02:00
commit 8ae09e81e0
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp vendored
View file

@ -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 {