Merge pull request #865 from mapbox/android-libuv-fix

Upgrade to libuv 1.4.0 to fix bug on arm64
mapbox · Feb 12, 2015 · f6380b8 · f6380b8
2 parents b1c2c91 + acfeda9
commit f6380b8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/configure b/configure
@@ -30,7 +30,7 @@ case ${MASON_PLATFORM} in
         LIBJPEG_VERSION=v9a
         OPENSSL_VERSION=1.0.1l
         LIBCURL_VERSION=7.40.0
-        LIBUV_VERSION=0.11.29
+        LIBUV_VERSION=1.4.0
         ZLIB_VERSION=system
         BOOST_VERSION=1.57.0
         NUNICODE_VERSION=1.5.1

diff --git a/include/mbgl/util/uv-messenger.h b/include/mbgl/util/uv-messenger.h
@@ -1,12 +1,12 @@
 #ifndef MBGL_UTIL_UV_MESSENGER
 #define MBGL_UTIL_UV_MESSENGER
 
+#include <uv.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <uv.h>
-
 typedef struct uv_messenger_s uv_messenger_t;
 typedef void (*uv_messenger_cb)(void *arg);
 typedef void (*uv_messenger_stop_cb)(uv_messenger_t *msgr);

diff --git a/src/mbgl/util/uv-channel.h b/src/mbgl/util/uv-channel.h
@@ -1,12 +1,12 @@
 #ifndef MBGL_UTIL_UV_CHANNEL
 #define MBGL_UTIL_UV_CHANNEL
 
+#include <uv.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <uv.h>
-
 // Taken from http://navaneeth.github.io/blog/2013/08/02/channels-in-libuv/
 
 typedef struct uv_chan_s uv_chan_t;

diff --git a/src/mbgl/util/uv-worker.h b/src/mbgl/util/uv-worker.h
@@ -1,14 +1,14 @@
 #ifndef MBGL_UTIL_UV_WORKER
 #define MBGL_UTIL_UV_WORKER
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <stdlib.h>
 
 #include <mbgl/util/uv-messenger.h>
 #include <mbgl/util/uv-channel.h>
 
-#include <stdlib.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct uv_worker_s uv_worker_t;