X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=imap-send.c;h=e6090a0346ad4947791a04ffce71ba1d0a8e8e28;hb=6887f69faa11141c20be29d2fd51bb33e15e227a;hp=a0540ba5cf43e5af6c749f8c1bc7b06a7ff222ad;hpb=1725c4c64b462af36a9b7e83869af2806ea9d258;p=thirdparty%2Fgit.git

diff --git a/imap-send.c b/imap-send.c
index a0540ba5cf..e6090a0346 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1441,7 +1441,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)
 	curl_easy_setopt(curl, CURLOPT_PORT, server.port);
 
 	if (server.auth_method) {
-#if LIBCURL_VERSION_NUM < 0x072200
+#ifndef GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS
 		warning("No LOGIN_OPTIONS support in this cURL version");
 #else
 		struct strbuf auth = STRBUF_INIT;
@@ -1517,11 +1517,7 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
 	if (cred.username) {
 		if (res == CURLE_OK)
 			credential_approve(&cred);
-#if LIBCURL_VERSION_NUM >= 0x070d01
 		else if (res == CURLE_LOGIN_DENIED)
-#else
-		else
-#endif
 			credential_reject(&cred);
 	}