Merge branch 'master' into mesa

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();

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");
         }

src/map/map.cpp

@@ -91,15 +91,28 @@ void Map::start() {
     is_stopped = false;
 
     // Setup async notifications
-    uv_async_init(**loop, async_terminate.get(), terminate);
+
+// Iron out the differences between libuv 0.10 and 0.11
+#ifdef UV_ASYNC_CALLBACK
+#error Cannot overwrite UV_ASYNC_CALLBACK
+#endif
+#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
+#define UV_ASYNC_CALLBACK(name) [](uv_async_t *a, int) { return Map::name(a); }
+#else
+#define UV_ASYNC_CALLBACK(name) name
+#endif
+
+    uv_async_init(**loop, async_terminate.get(), UV_ASYNC_CALLBACK(terminate));
     async_terminate->data = this;
 
-    uv_async_init(**loop, async_render.get(), render);
+    uv_async_init(**loop, async_render.get(), UV_ASYNC_CALLBACK(render));
     async_render->data = this;
 
-    uv_async_init(**loop, async_cleanup.get(), cleanup);
+    uv_async_init(**loop, async_cleanup.get(), UV_ASYNC_CALLBACK(cleanup));
     async_cleanup->data = this;
 
+#undef UV_ASYNC_CALLBACK
+
     uv_thread_create(*thread, [](void *arg) {
         Map *map = static_cast<Map *>(arg);
 #ifndef NDEBUG
@@ -198,11 +211,7 @@ void Map::cleanup() {
     }
 }
 
-#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-void Map::cleanup(uv_async_t *async, int) {
-#else
 void Map::cleanup(uv_async_t *async) {
-#endif
     Map *map = static_cast<Map *>(async->data);
 
     map->painter.cleanup();
@@ -223,11 +232,7 @@ void Map::setReachability(bool reachable) {
     }
 }
 
-#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-void Map::render(uv_async_t *async, int) {
-#else
 void Map::render(uv_async_t *async) {
-#endif
     Map *map = static_cast<Map *>(async->data);
     assert(uv_thread_self() == map->map_thread);
 
@@ -247,11 +252,7 @@ void Map::render(uv_async_t *async) {
     }
 }
 
-#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-void Map::terminate(uv_async_t *async, int) {
-#else
 void Map::terminate(uv_async_t *async) {
-#endif
     // Closes all open handles on the loop. This means that the loop will automatically terminate.
     Map *map = static_cast<Map *>(async->data);
     assert(uv_thread_self() == map->map_thread);