diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 14:37:10 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 14:37:10 -0400 |
| commit | 35f2c7fe23fd9265e22897bbcb6bcef66e9e7032 (patch) | |
| tree | 8eb6d09960b9b62cefdb23a2b4d7c112b9d07185 /common | |
| parent | ee68c091a858d70b8c66277cb4d3d9cbec1a9b14 (diff) | |
| download | qtlocation-mapboxgl-35f2c7fe23fd9265e22897bbcb6bcef66e9e7032.tar.gz | |
switch http_request_baton_curl to libuv 0.10 api
Diffstat (limited to 'common')
| -rw-r--r-- | common/http_request_baton_curl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/http_request_baton_curl.cpp b/common/http_request_baton_curl.cpp index 772aeb86e1..726198d1dd 100644 --- a/common/http_request_baton_curl.cpp +++ b/common/http_request_baton_curl.cpp @@ -253,7 +253,7 @@ int handle_socket(CURL *handle, curl_socket_t sockfd, int action, void *, void * return 0; } -void on_timeout(uv_timer_t *) { +void on_timeout(uv_timer_t *, int status) { int running_handles; CURLMcode error = curl_multi_socket_action(multi, CURL_SOCKET_TIMEOUT, 0, &running_handles); if (error != CURLM_OK) { @@ -442,7 +442,6 @@ void stop_request(void *const ptr) { void create_thread() { uv_mutex_init(&share_mutex); - uv_loop_init(&loop); uv_messenger_init(&loop, &start_messenger, start_request); uv_messenger_init(&loop, &stop_messenger, stop_request); uv_thread_create(&thread, thread_init, nullptr); |