From 4ca21db5dfec46f9052c39eb9b5228bd7a323f41 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 30 Jan 2015 14:14:11 +1100
Subject: [PATCH 1/2] Use libuv 1.4.0 for arm64 support

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b818faa07af..378adcf2922 100755
--- 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

From acfeda98990d792280c321a7718ad8010428eddf Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Wed, 11 Feb 2015 19:01:30 -0800
Subject: [PATCH 2/2] Fix #include <uv.h> mixing between C and C++ modes

---
 include/mbgl/util/uv-messenger.h | 4 ++--
 src/mbgl/util/uv-channel.h       | 4 ++--
 src/mbgl/util/uv-worker.h        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/mbgl/util/uv-messenger.h b/include/mbgl/util/uv-messenger.h
index 946867fe8b1..35c5ce21885 100644
--- 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
index ea5c279f652..0a0d7064774 100644
--- 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
index 5640bfd14d8..65ad42edb85 100644
--- 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;