aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/curl_input_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-10-11 20:33:17 +0200
committerMax Kellermann <max@duempel.org>2010-10-11 20:33:17 +0200
commita57f9e712d498e0911fde56e0281e01e3807becc (patch)
tree05a36d297fb46b40c6fa4eed5d2ced0dc91ce918 /src/input/curl_input_plugin.c
parente6fc88a758af2f0a37376c5c8dcf90db05e4e45a (diff)
parentb552e9a12077dc73ba7d2aaad7c79a8201efff12 (diff)
downloadmpd-a57f9e712d498e0911fde56e0281e01e3807becc.tar.gz
mpd-a57f9e712d498e0911fde56e0281e01e3807becc.tar.xz
mpd-a57f9e712d498e0911fde56e0281e01e3807becc.zip
Merge release 0.15.13 from branch 'v0.15.x'
Conflicts: NEWS configure.ac src/input/rewind_input_plugin.c src/output/httpd_output_plugin.c
Diffstat (limited to 'src/input/curl_input_plugin.c')
-rw-r--r--src/input/curl_input_plugin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c
index f1c54cdbe..ae645bddf 100644
--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -264,7 +264,7 @@ input_curl_select(struct input_curl *c, GError **error_r)
return -1;
}
-#if LIBCURL_VERSION_NUM >= 0x070f00
+#if LIBCURL_VERSION_NUM >= 0x070f04
long timeout2;
mcode = curl_multi_timeout(c->multi, &timeout2);
if (mcode != CURLM_OK) {