diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-10 18:36:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-10 18:36:11 (GMT) |
| commit | bb72fff2f09ef307b74de35ab00dfc08e6da83ee (patch) | |
| tree | b919209648ec35acaf9ce10c23471bc9cbd7d549 /Utilities/cmcurl/lib/socks.h | |
| parent | f236c9cff9dcb4d4534e5532a9792e648d48d921 (diff) | |
| parent | d4da4755cdab41679ae7c2fa6ef2984a2d6837ec (diff) | |
| download | CMake-bb72fff2f09ef307b74de35ab00dfc08e6da83ee.zip CMake-bb72fff2f09ef307b74de35ab00dfc08e6da83ee.tar.gz CMake-bb72fff2f09ef307b74de35ab00dfc08e6da83ee.tar.bz2 | |
Merge topic 'update-curl'
d4da4755 Help: Add notes for topic 'update-curl'
14c77153 Tests: Fix `file://` URLs given to curl
73ae6700 curl: Fix passing _WINSOCKAPI_ macro to compiler
1df9d5f9 Merge branch 'upstream-curl' into update-curl
4cc2908f curl 2016-12-22 (44b9b4d4)
f4a3290a curl: Update script to get curl 7.52.1
Diffstat (limited to 'Utilities/cmcurl/lib/socks.h')
| -rw-r--r-- | Utilities/cmcurl/lib/socks.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Utilities/cmcurl/lib/socks.h b/Utilities/cmcurl/lib/socks.h index a44ada6..348707e 100644 --- a/Utilities/cmcurl/lib/socks.h +++ b/Utilities/cmcurl/lib/socks.h @@ -25,7 +25,7 @@ #include "curl_setup.h" #ifdef CURL_DISABLE_PROXY -#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN +#define Curl_SOCKS4(a,b,c,d,e) CURLE_NOT_BUILT_IN #define Curl_SOCKS5(a,b,c,d,e,f) CURLE_NOT_BUILT_IN #else /* @@ -49,8 +49,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name, const char *hostname, int remote_port, int sockindex, - struct connectdata *conn, - bool protocol4a); + struct connectdata *conn); /* * This function logs in to a SOCKS5 proxy and sends the specifics to the |