From f50d8bbf3a2e089ee076c2d4527d3922fd5781a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 27 Oct 2014 12:05:29 -0400
Subject: fix build with libuv 0.11

---
 include/mbgl/map/map.hpp        | 6 ------
 include/mbgl/util/uv_detail.hpp | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'include')

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");
         }
-- 
cgit v1.2.1