summaryrefslogtreecommitdiffstats
path: root/http.c
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsayjones.plus.com>2018-03-14 22:56:06 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-15 21:11:52 +0100
commitb8fd6008ec5651925c46858499f182222174392c (patch)
treefc605775935a9301e96bd45964282dc6f75a1a2b /http.c
parentMerge branch 'ys/bisect-object-id-missing-conversion-fix' into maint (diff)
downloadgit-b8fd6008ec5651925c46858499f182222174392c.tar.xz
git-b8fd6008ec5651925c46858499f182222174392c.zip
http: fix an unused variable warning for 'curl_no_proxy'
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/http.c b/http.c
index 5977712712..b930c0e628 100644
--- a/http.c
+++ b/http.c
@@ -66,6 +66,9 @@ static const char *ssl_key;
#if LIBCURL_VERSION_NUM >= 0x070908
static const char *ssl_capath;
#endif
+#if LIBCURL_VERSION_NUM >= 0x071304
+static const char *curl_no_proxy;
+#endif
#if LIBCURL_VERSION_NUM >= 0x072c00
static const char *ssl_pinnedkey;
#endif
@@ -74,7 +77,6 @@ static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv;
static const char *curl_http_proxy;
-static const char *curl_no_proxy;
static const char *http_proxy_authmethod;
static struct {
const char *name;