From: Rupa Schomaker <rupa@rupa.com>
Date: Thu, 26 Nov 2009 15:54:10 +0000 (+0000)
Subject: choose CURLOPT_TIMEOUT variant at compile time, use MS if available
X-Git-Tag: v1.0.6~1226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a111968873572f51ed2223c9891e89861a411acf;p=thirdparty%2Ffreeswitch.git

choose CURLOPT_TIMEOUT variant at compile time, use MS if available


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15686 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/mod/applications/mod_cidlookup/mod_cidlookup.c b/src/mod/applications/mod_cidlookup/mod_cidlookup.c
index ac05561eb7..3c9fecb15b 100755
--- a/src/mod/applications/mod_cidlookup/mod_cidlookup.c
+++ b/src/mod/applications/mod_cidlookup/mod_cidlookup.c
@@ -386,9 +386,12 @@ static char *do_lookup_url(switch_memory_pool_t *pool, switch_event_t *event, co
 	curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
 	/*
 	 TIMEOUT_MS is introduced in 7.16.2, we have 7.16.0 in tree 
+	 */
+#ifdef CURLOPT_TIMEOUT_MS
 	curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT_MS, globals.curl_timeout);
-	*/
+#else
 	curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, globals.curl_timeout/1000);
+#endif
 	curl_easy_setopt(curl_handle, CURLOPT_URL, query);
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback);
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &http_data);