From 2f9d60ed7f0c05964bbe2110aeda8da6ec17bae6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 14 Oct 2016 14:44:15 +0200
Subject: CURL_AT_LEAST_VERSION -> LIBCURL_VERSION_NUM

http://hydra.nixos.org/build/42025230
---
 src/libstore/download.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index 2229e291eab2..97e9b0b2fd66 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -15,7 +15,6 @@
 #include <cmath>
 #include <random>
 
-
 namespace nix {
 
 double getTime()
@@ -188,10 +187,10 @@ struct CurlDownloader : public Downloader
             curl_easy_setopt(req, CURLOPT_FOLLOWLOCATION, 1L);
             curl_easy_setopt(req, CURLOPT_NOSIGNAL, 1);
             curl_easy_setopt(req, CURLOPT_USERAGENT, ("Nix/" + nixVersion).c_str());
-            #if CURL_AT_LEAST_VERSION(7, 43, 0)
+            #if LIBCURL_VERSION_NUM >= 0x072b00
             curl_easy_setopt(req, CURLOPT_PIPEWAIT, 1);
             #endif
-            #if CURL_AT_LEAST_VERSION(7, 47, 0)
+            #if LIBCURL_VERSION_NUM >= 0x072f00
             if (downloader.enableHttp2)
                 curl_easy_setopt(req, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
             #endif
@@ -303,7 +302,7 @@ struct CurlDownloader : public Downloader
 
         curlm = curl_multi_init();
 
-        #if CURL_AT_LEAST_VERSION(7, 43, 0) // correct?
+        #if LIBCURL_VERSION_NUM >= 0x072b00 // correct?
         curl_multi_setopt(curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
         #endif
         curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS,
-- 
cgit 1.4.1