From: Matthew Booth <mbooth@redhat.com>
Date: Wed, 14 May 2014 23:28:40 +0000 (-0400)
Subject: curl: Fix build when curl_multi_socket_action isn't available
X-Git-Tag: v2.1.0-rc0~115^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9aedd5a5d607216e41bfa6a2c1f7f5d2b17041c3;p=thirdparty%2Fqemu.git

curl: Fix build when curl_multi_socket_action isn't available

Signed-off-by: Matthew Booth <mbooth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/curl.c b/block/curl.c
index d2f1084b913..f3c797ad09f 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -37,6 +37,21 @@
 #if LIBCURL_VERSION_NUM >= 0x071000
 /* The multi interface timer callback was introduced in 7.16.0 */
 #define NEED_CURL_TIMER_CALLBACK
+#define HAVE_SOCKET_ACTION
+#endif
+
+#ifndef HAVE_SOCKET_ACTION
+/* If curl_multi_socket_action isn't available, define it statically here in
+ * terms of curl_multi_socket. Note that ev_bitmask will be ignored, which is
+ * less efficient but still safe. */
+static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,
+                                            curl_socket_t sockfd,
+                                            int ev_bitmask,
+                                            int *running_handles)
+{
+    return curl_multi_socket(multi_handle, sockfd, running_handles);
+}
+#define curl_multi_socket_action __curl_multi_socket_action
 #endif
 
 #define PROTOCOLS (CURLPROTO_HTTP | CURLPROTO_HTTPS | \