diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-27 12:05:29 -0400 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-27 12:17:52 -0400 |
commit | f50d8bbf3a2e089ee076c2d4527d3922fd5781a7 (patch) | |
tree | c671cef837d170c08039011af0f54cbc15180fb4 /include | |
parent | af9f317c251a0a1adfeaad8dd983ab602cf93070 (diff) | |
download | qtlocation-mapboxgl-f50d8bbf3a2e089ee076c2d4527d3922fd5781a7.tar.gz |
fix build with libuv 0.11
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/map/map.hpp | 6 | ||||
-rw-r--r-- | include/mbgl/util/uv_detail.hpp | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index ab9775a8c9..bc67e5b35b 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -146,15 +146,9 @@ public: private: // uv async callbacks -#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 - static void render(uv_async_t *async, int status); - static void terminate(uv_async_t *async, int status); - static void cleanup(uv_async_t *async, int status); -#else static void render(uv_async_t *async); static void terminate(uv_async_t *async); static void cleanup(uv_async_t *async); -#endif // Setup void setup(); diff --git a/include/mbgl/util/uv_detail.hpp b/include/mbgl/util/uv_detail.hpp index b4b41f31af..3bbfa4ac5a 100644 --- a/include/mbgl/util/uv_detail.hpp +++ b/include/mbgl/util/uv_detail.hpp @@ -29,7 +29,7 @@ public: if (l == nullptr) { #else l = new uv_loop_t; - if (uv_loop_init(&l) != 0) { + if (uv_loop_init(l) != 0) { #endif throw std::runtime_error("failed to initialize loop"); } |