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 /platform/default/headless_display.cpp | |
| parent | 80f1795b377b0d942ffe6d6e7dcf7afacbbbf073 (diff) | |
| download | qtlocation-mapboxgl-e8a2c393654a1ebfbc7502432fdd0a43398a0cdf.tar.gz | |
forward declare GLX typedefs to limit conflicts from glx.h
Diffstat (limited to 'platform/default/headless_display.cpp')
| -rw-r--r-- | platform/default/headless_display.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/default/headless_display.cpp b/platform/default/headless_display.cpp index 4756c8d2cb..c4535fc1a6 100644 --- a/platform/default/headless_display.cpp +++ b/platform/default/headless_display.cpp @@ -3,6 +3,10 @@ #include <cstring> #include <stdexcept> +#if MBGL_USE_GLX +#include <GL/glx.h> +#endif + namespace mbgl { HeadlessDisplay::HeadlessDisplay() { @@ -52,7 +56,7 @@ HeadlessDisplay::HeadlessDisplay() { // We're creating a dummy pbuffer anyway that we're not using. static int pixelFormat[] = { GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT, - 0 + None }; int configs = 0; |