[sword-svn] r1700 - trunk/src/mgr

[jansorg at crosswire.org]

Author: jansorg
Date: 2005-01-28 15:37:55 -0700 (Fri, 28 Jan 2005)
New Revision: 1700

Modified:
   trunk/src/mgr/curlftpt.cpp
Log:
fix to the fix to the fix of the ifdef logic :)

Modified: trunk/src/mgr/curlftpt.cpp
===================================================================
--- trunk/src/mgr/curlftpt.cpp	2005-01-28 22:29:48 UTC (rev 1699)
+++ trunk/src/mgr/curlftpt.cpp	2005-01-28 22:37:55 UTC (rev 1700)
@@ -97,13 +97,16 @@
 		
 		/* FTP connection settings */
 #if LIBCURL_VERSION_MAJOR >= 7
-#if LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR>=10 && LIBCURL_VERSION_PATCH>=6
-		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0); //curl >= 7.10.6
-#else
-		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0); //curl 8.0 or later
+#define EPRT_AVAILABLE 1
+#if (LIBCURL_VERSION_MINOR<=10) || (LIBCURL_VERSION_MINOR==10 && LIBCURL_VERSION_PATCH<=6)
+#undef EPRT_AVAILABLE
 #endif
 #endif
 
+#ifdef EPRT_AVAILABLE
+		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0); //curl 8.0 or later
+#endif
+		
 		res = curl_easy_perform(session);
 
 		if(CURLE_OK != res) {