summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKonstantin Käfer <konstantin@mapbox.com>2014-10-15 14:20:28 +0000
committerKonstantin Käfer <konstantin@mapbox.com>2014-10-15 14:20:28 +0000
commit8eda68dd8a24ee5025db82d02f952fdd5921eea3 (patch)
tree0980f6fa04a8c21920d57b22fe87931a4e3f1302 /common
parent9ff1d9e3bdc05817d9f9de820e1d07dd17a699cd (diff)
downloadqtlocation-mapboxgl-8eda68dd8a24ee5025db82d02f952fdd5921eea3.tar.gz
fix errors that prevented compilation/running
Diffstat (limited to 'common')
-rw-r--r--common/headless_display.cpp1
-rw-r--r--common/headless_view.cpp2
-rw-r--r--common/headless_view.hpp4
3 files changed, 4 insertions, 3 deletions
diff --git a/common/headless_display.cpp b/common/headless_display.cpp
index a938347527..3e30d62749 100644
--- a/common/headless_display.cpp
+++ b/common/headless_display.cpp
@@ -1,5 +1,6 @@
#include "headless_display.hpp"
+#include <cstring>
#include <stdexcept>
namespace mbgl {
diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index dd62d9d23e..51196faede 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -118,7 +118,7 @@ void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) {
GLX_PBUFFER_HEIGHT, h,
None
};
- GLXPbuffer pbuffer = glXCreatePbuffer(x_display, fg_configs[0], attributes);
+ glx_pbuffer = glXCreatePbuffer(x_display, fb_configs[0], attributes);
#endif
}
diff --git a/common/headless_view.hpp b/common/headless_view.hpp
index 9ba25c73f0..ec76f1a077 100644
--- a/common/headless_view.hpp
+++ b/common/headless_view.hpp
@@ -4,7 +4,7 @@
#ifdef __APPLE__
#define MBGL_USE_CGL 1
#else
-#include "glx.h"
+#include <GL/glx.h>
#define MBGL_USE_GLX 1
#endif
@@ -55,7 +55,7 @@ private:
Display *x_display = nullptr;
GLXFBConfig *fb_configs = nullptr;
GLXContext gl_context = nullptr;
- GLXPBuffer glx_pbuffer = 0;
+ GLXPbuffer glx_pbuffer = 0;
#endif
};