From cfb6e2752c14c33b23da83c4441415d5afed2fc5 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Tue, 2 Dec 2014 20:04:12 +1100 Subject: [PATCH] Fix Linux build --- .../android/asset_request_baton_libzip.cpp | 1 - platform/default/asset_request_baton_noop.cpp | 4 ---- src/storage/asset_request_baton.cpp | 18 +++++++++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/platform/android/asset_request_baton_libzip.cpp b/platform/android/asset_request_baton_libzip.cpp index 80f1d02dd..a492079c2 100644 --- a/platform/android/asset_request_baton_libzip.cpp +++ b/platform/android/asset_request_baton_libzip.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/platform/default/asset_request_baton_noop.cpp b/platform/default/asset_request_baton_noop.cpp index 33e8ad739..e0d5755a7 100644 --- a/platform/default/asset_request_baton_noop.cpp +++ b/platform/default/asset_request_baton_noop.cpp @@ -1,11 +1,7 @@ -#include #include #include #include -#include -#include - namespace mbgl { void AssetRequestBaton::run(uv_async_t *async) { diff --git a/src/storage/asset_request_baton.cpp b/src/storage/asset_request_baton.cpp index 918324108..baefb3002 100644 --- a/src/storage/asset_request_baton.cpp +++ b/src/storage/asset_request_baton.cpp @@ -1,11 +1,7 @@ -#include #include #include #include -#include -#include - namespace mbgl { AssetRequestBaton::AssetRequestBaton(AssetRequest *request_, const std::string &path_, uv_loop_t *loop) @@ -14,9 +10,21 @@ AssetRequestBaton::AssetRequestBaton(AssetRequest *request_, const std::string & async_run(new uv_async_t()), path(path_) { - uv_async_init(loop, async_run.get(), run); +// 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 AssetRequestBaton::name(a); } +#else +#define UV_ASYNC_CALLBACK(name) name +#endif + + uv_async_init(loop, async_run.get(), UV_ASYNC_CALLBACK(run)); async_run->data = this; +#undef UV_ASYNC_CALLBACK + uv_async_send(async_run.get()); }