summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-10-13 14:27:09 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-10-14 11:36:28 -0400
commit62595a9b394547bffb8c2965b103bd87dd397e15 (patch)
treed97215f2b66d01d6dffa4252b1aa26e76b90f08d /bin
parent5b9deae95709ea557f28e4a5dcbe3ac8fd47023e (diff)
downloadqtlocation-mapboxgl-62595a9b394547bffb8c2965b103bd87dd397e15.tar.gz
[core] bump libuv to 1.7.5 across all platforms
UV_ASYNC_PARAMS and UV_TIMER_PARAMS for libuv <= 0.10 compatibility use st_mtim.tv_sec in libuv > 0.10.x
Diffstat (limited to 'bin')
-rw-r--r--bin/render.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/render.cpp b/bin/render.cpp
index b89ca256e4..685f3ddac4 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -24,6 +24,12 @@ namespace po = boost::program_options;
#include <cstdlib>
#include <iostream>
+#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
+#define UV_ASYNC_PARAMS(handle) uv_async_t *handle, int
+#else
+#define UV_ASYNC_PARAMS(handle) uv_async_t *handle
+#endif
+
int main(int argc, char *argv[]) {
std::string style_path;
double lat = 0, lon = 0;
@@ -98,7 +104,7 @@ int main(int argc, char *argv[]) {
}
uv_async_t *async = new uv_async_t;
- uv_async_init(uv_default_loop(), async, [](uv_async_t *as, int) {
+ uv_async_init(uv_default_loop(), async, [](UV_ASYNC_PARAMS(as)) {
std::unique_ptr<const StillImage> image(reinterpret_cast<const StillImage *>(as->data));
uv_close(reinterpret_cast<uv_handle_t *>(as), [](uv_handle_t *handle) {
delete reinterpret_cast<uv_async_t *>(handle);