From 62595a9b394547bffb8c2965b103bd87dd397e15 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 13 Oct 2015 14:27:09 -0400 Subject: [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 --- test/storage/http_error.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'test/storage') diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp index be2811cd06..7edce61e5c 100644 --- a/test/storage/http_error.cpp +++ b/test/storage/http_error.cpp @@ -7,6 +7,12 @@ #include +#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 +#define UV_TIMER_PARAMS uv_timer_t*, int +#else +#define UV_TIMER_PARAMS uv_timer_t* +#endif + TEST_F(Storage, HTTPError) { SCOPED_TEST(HTTPTemporaryError) SCOPED_TEST(HTTPConnectionError) @@ -15,7 +21,7 @@ TEST_F(Storage, HTTPError) { uv_timer_t statusChange; uv_timer_init(uv_default_loop(), &statusChange); - uv_timer_start(&statusChange, [](uv_timer_t *, int) { + uv_timer_start(&statusChange, [](UV_TIMER_PARAMS) { NetworkStatus::Reachable(); }, 500, 500); uv_unref((uv_handle_t *)&statusChange); -- cgit v1.2.1