summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-08-20 19:43:29 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-08-20 19:43:29 -0400
commit3466f364121b3a0a157ce62c417c94802484351a (patch)
treee736b45ab02cc892122661665cd0921923b70853 /include
parent1ff71a78e05e0c12fca26fea2c7bda14b237631a (diff)
downloadqtlocation-mapboxgl-3466f364121b3a0a157ce62c417c94802484351a.tar.gz
bump mapnik-packaging, conform to libuv 0.10 api
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp8
-rw-r--r--include/mbgl/platform/request.hpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index fba38879ed..4c5952a2c1 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -129,10 +129,10 @@ public:
private:
// uv async callbacks
- static void render(uv_async_t *async);
- static void terminate(uv_async_t *async);
- static void cleanup(uv_async_t *async);
- static void delete_async(uv_handle_t *handle);
+ 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);
+ static void delete_async(uv_handle_t *handle, int status);
// Setup
void setup();
diff --git a/include/mbgl/platform/request.hpp b/include/mbgl/platform/request.hpp
index 0cbacf645d..2a231769c1 100644
--- a/include/mbgl/platform/request.hpp
+++ b/include/mbgl/platform/request.hpp
@@ -24,7 +24,7 @@ public:
void complete();
private:
- static void complete(uv_async_t *async);
+ static void complete(uv_async_t *async, int status);
public:
const std::string url;