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

[jansorg at crosswire.org]

Author: jansorg
Date: 2005-01-28 15:29:48 -0700 (Fri, 28 Jan 2005)
New Revision: 1699

Modified:
   trunk/src/mgr/curlftpt.cpp
Log:
fixed the ifdef logic

Modified: trunk/src/mgr/curlftpt.cpp
===================================================================
--- trunk/src/mgr/curlftpt.cpp	2005-01-28 19:27:38 UTC (rev 1698)
+++ trunk/src/mgr/curlftpt.cpp	2005-01-28 22:29:48 UTC (rev 1699)
@@ -96,9 +96,13 @@
 		curl_easy_setopt(session, CURLOPT_VERBOSE, true);
 		
 		/* FTP connection settings */
-#ifdef LIBCURL_VERSION_MAJOR>=7 && LIBCURL_VERSION_MINOR>=10 && LIBCURL_VERSION_PATCH>=6
-		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0);
+#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
 #endif
+#endif
 
 		res = curl_easy_perform(session);