diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-02-10 10:53:44 -0800 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-02-10 13:38:45 -0800 |
| commit | e8a2c393654a1ebfbc7502432fdd0a43398a0cdf (patch) | |
| tree | f94d081c99efe43a645028a62793e1d8f765ac66 /include | |
| parent | 80f1795b377b0d942ffe6d6e7dcf7afacbbbf073 (diff) | |
| download | qtlocation-mapboxgl-e8a2c393654a1ebfbc7502432fdd0a43398a0cdf.tar.gz | |
forward declare GLX typedefs to limit conflicts from glx.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/platform/default/glx.h | 2 | ||||
| -rw-r--r-- | include/mbgl/platform/default/headless_view.hpp | 7 |
2 files changed, 5 insertions, 4 deletions
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> |