diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2012-09-06 20:51:30 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-09-06 20:51:30 +0200 |
| commit | 2e7d2c8f7497d8eca30be1b98c9d0c80ef26e55f (patch) | |
| tree | cbf33c4ee8caf1a45cb6c5081301f676a16d81e7 /lib | |
| parent | 3a0b64489f1ae721d6647fa4fc90b7dbb91dd387 (diff) | |
| download | curl-2e7d2c8f7497d8eca30be1b98c9d0c80ef26e55f.tar.gz | |
SOCKS: truly disable it if CURL_DISABLE_PROXY is defined
Bug: http://curl.haxx.se/bug/view.cgi?id=3561305
Patch by: Marcel Raad
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/socks.c | 2 | ||||
| -rw-r--r-- | lib/socks_sspi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/socks.c b/lib/socks.c index b382de798..43e6d95f6 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -22,7 +22,7 @@ #include "setup.h" -#if !defined(CURL_DISABLE_PROXY) || defined(USE_WINDOWS_SSPI) +#if !defined(CURL_DISABLE_PROXY) #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index edebf7a47..6e95e3c35 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -23,7 +23,7 @@ #include "setup.h" -#ifdef USE_WINDOWS_SSPI +#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY) #include "urldata.h" #include "sendf.h" |