[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/4] curl: Fix build when curl_multi_socket_action i
From: |
Matthew Booth |
Subject: |
[Qemu-devel] [PATCH 4/4] curl: Fix build when curl_multi_socket_action isn't available |
Date: |
Thu, 8 May 2014 09:42:20 +0100 |
Signed-off-by: Matthew Booth <address@hidden>
---
block/curl.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/curl.c b/block/curl.c
index 8cf0a3e..e5581f5 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -38,6 +38,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 | \
--
1.9.0
- [Qemu-devel] Curl updates, Matthew Booth, 2014/05/08
- [Qemu-devel] [PATCH 3/4] curl: Add usage documentation, Matthew Booth, 2014/05/08
- [Qemu-devel] [PATCH 2/4] curl: Add sslverify option, Matthew Booth, 2014/05/08
- [Qemu-devel] [PATCH 4/4] curl: Fix build when curl_multi_socket_action isn't available,
Matthew Booth <=
- Re: [Qemu-devel] Curl updates, Eric Blake, 2014/05/13
- Re: [Qemu-devel] Curl updates, Kevin Wolf, 2014/05/14
- Re: [Qemu-devel] Curl updates, Eric Blake, 2014/05/14
- Re: [Qemu-devel] Curl updates, Matthew Booth, 2014/05/14
- Re: [Qemu-devel] Curl updates, Kevin Wolf, 2014/05/14
- Re: [Qemu-devel] Curl updates, Matthew Booth, 2014/05/14
- Re: [Qemu-devel] Curl updates, Eric Blake, 2014/05/14
- Re: [Qemu-devel] Curl updates, Eric Blake, 2014/05/14
Re: [Qemu-devel] Curl updates, Matthew Booth, 2014/05/14