mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 20:53:55 +01:00
Code

Merge branch 'rj/http-code-cleanup'

Browse Source 
There was an unused file-scope static variable left in http.c when
building for versions of libCURL that is older than 7.19.4, which
has been fixed.

* rj/http-code-cleanup:
  http: fix an unused variable warning for 'curl_no_proxy'
This commit is contained in:
Junio C Hamano 2018-03-21 11:30:12 -07:00
commit 79cc6432ec
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
http.c
View File

@ -69,6 +69,9 @@ static const char *ssl_key;
#if LIBCURL_VERSION_NUM >= 0x070908 #if LIBCURL_VERSION_NUM >= 0x070908
static const char *ssl_capath; static const char *ssl_capath;
#endif #endif
#if LIBCURL_VERSION_NUM >= 0x071304
static const char *curl_no_proxy;
#endif
#if LIBCURL_VERSION_NUM >= 0x072c00 #if LIBCURL_VERSION_NUM >= 0x072c00
static const char *ssl_pinnedkey; static const char *ssl_pinnedkey;
#endif #endif
@ -77,7 +80,6 @@ static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1; static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv; static int curl_ftp_no_epsv;
static const char *curl_http_proxy; static const char *curl_http_proxy;
static const char *curl_no_proxy;
static const char *http_proxy_authmethod; static const char *http_proxy_authmethod;
static struct { static struct {
const char *name; const char *name;