diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-01-22 07:02:14 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 10:49:06 +0100 |
| commit | 92a7f73bbe10f817d5c2d607ba07fc69b859593b (patch) | |
| tree | 6dfb4734d3b8731e8ec21cd036b192eceb31104b /include/mbgl | |
| parent | bf629c97db98cc835e324409edfd8729bb3583c2 (diff) | |
| download | qtlocation-mapboxgl-92a7f73bbe10f817d5c2d607ba07fc69b859593b.tar.gz | |
fixes for linux
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/platform/default/headless_view.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/storage/file_cache.hpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index e29f529f3d..2fad430e6e 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -7,6 +7,7 @@ #define GL_GLEXT_PROTOTYPES #include <mbgl/platform/default/glx.h> #define MBGL_USE_GLX 1 +#undef Status #endif #include <mbgl/map/view.hpp> diff --git a/include/mbgl/storage/file_cache.hpp b/include/mbgl/storage/file_cache.hpp index 38a82cc237..97e75a5d85 100644 --- a/include/mbgl/storage/file_cache.hpp +++ b/include/mbgl/storage/file_cache.hpp @@ -4,6 +4,7 @@ #include <mbgl/util/noncopyable.hpp> #include <functional> +#include <memory> namespace mbgl { |