From e8a2c393654a1ebfbc7502432fdd0a43398a0cdf Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Tue, 10 Feb 2015 10:53:44 -0800
Subject: forward declare GLX typedefs to limit conflicts from glx.h

---
 include/mbgl/platform/default/glx.h             | 2 --
 include/mbgl/platform/default/headless_view.hpp | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 include/mbgl/platform/default/glx.h

(limited to 'include/mbgl/platform')

diff --git a/include/mbgl/platform/default/glx.h b/include/mbgl/platform/default/glx.h
deleted file mode 100644
index 6b7d9a3df9..0000000000
--- a/include/mbgl/platform/default/glx.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <GL/glx.h>
-#undef None
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index 2fad430e6e..ba318c2b41 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -5,9 +5,12 @@
 #define MBGL_USE_CGL 1
 #else
 #define GL_GLEXT_PROTOTYPES
-#include <mbgl/platform/default/glx.h>
 #define MBGL_USE_GLX 1
-#undef Status
+typedef struct _XDisplay Display;
+typedef struct __GLXcontextRec* GLXContext;
+typedef struct __GLXFBConfigRec* GLXFBConfig;
+typedef long unsigned int XID;
+typedef XID GLXPbuffer;
 #endif
 
 #include <mbgl/map/view.hpp>
-- 
cgit v1.2.1