Skip to content

Commit 79cc643

Browse files
committed
Merge branch 'rj/http-code-cleanup'
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'
2 parents 5647103 + b8fd600 commit 79cc643

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

http.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ static const char *ssl_key;
6969
#if LIBCURL_VERSION_NUM >= 0x070908
7070
static const char *ssl_capath;
7171
#endif
72+
#if LIBCURL_VERSION_NUM >= 0x071304
73+
static const char *curl_no_proxy;
74+
#endif
7275
#if LIBCURL_VERSION_NUM >= 0x072c00
7376
static const char *ssl_pinnedkey;
7477
#endif
@@ -77,7 +80,6 @@ static long curl_low_speed_limit = -1;
7780
static long curl_low_speed_time = -1;
7881
static int curl_ftp_no_epsv;
7982
static const char *curl_http_proxy;
80-
static const char *curl_no_proxy;
8183
static const char *http_proxy_authmethod;
8284
static struct {
8385
const char *name;

0 commit comments

Comments
 (0)