Changeset 10572 for branches

Timestamp:

May 1, 2010, 3:58:59 AM (12 years ago)

Author:

charles

Message:

(1.9x libT) backport r10484 for #3140 "transmission doesn't buil with curl 7.15.5"

File:

• branches/1.9x/libtransmission/web.c (modified) (4 diffs)

branches/1.9x/libtransmission/web.c

@@ -25 +25 @@
 #include "version.h" /* User-Agent */
 #include "web.h"
+
+#if LIBCURL_VERSION_NUM >= 0x070F06 /* CURLOPT_SOCKOPT* was added in 7.15.6 */
+ #define USE_LIBCURL_SOCKOPT
+#endif
 
 enum
@@ -97 +101 @@
 }
 
+#ifdef USE_LIBCURL_SOCKOPT
 static int
 sockoptfunction( void * vtask, curl_socket_t fd, curlsocktype purpose UNUSED )
@@ -116 +121 @@
     return 0;
 }
+#endif
 
 static int
@@ -160 +166 @@
     curl_easy_setopt( e, CURLOPT_NOSIGNAL, 1L );
     curl_easy_setopt( e, CURLOPT_PRIVATE, task );
+#ifdef USE_LIBCURL_SOCKOPT
     curl_easy_setopt( e, CURLOPT_SOCKOPTFUNCTION, sockoptfunction );
     curl_easy_setopt( e, CURLOPT_SOCKOPTDATA, task );
+#endif
     curl_easy_setopt( e, CURLOPT_SSL_VERIFYHOST, 0L );
     curl_easy_setopt( e, CURLOPT_SSL_VERIFYPEER, 0L );