diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-04-05 13:55:11 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-05 13:55:11 +0200 |
| commit | 8321a367ee1da094147384a6619334221f5d014c (patch) | |
| tree | 0a0dcd78448abf7ecdc4db3bf4bf8c114ca9531e /lib/socks.h | |
| parent | 8e9e19b0d582f9ee6e4f6a5f376e9b874869d319 (diff) | |
| download | curl-8321a367ee1da094147384a6619334221f5d014c.tar.gz | |
FTP+proxy: macrofied functions when proxy disabled
In my attempts to reduce #ifdefs in code, the SOCKS functions are now
macros when libcurl is built without proxy support and therefore the FTP
code could avoid some #ifs.
Diffstat (limited to 'lib/socks.h')
| -rw-r--r-- | lib/socks.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/socks.h b/lib/socks.h index 2bea66bf6..1c686d181 100644 --- a/lib/socks.h +++ b/lib/socks.h @@ -1,5 +1,5 @@ -#ifndef __SOCKS_H -#define __SOCKS_H +#ifndef __CURL_SOCKS_H +#define __CURL_SOCKS_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -22,6 +22,12 @@ * ***************************************************************************/ +#include "setup.h" + +#ifdef CURL_DISABLE_PROXY +#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_FAILED_INIT +#define Curl_SOCKS5(a,b,c,d,e,f) CURLE_FAILED_INIT +#else /* * Helper read-from-socket functions. Does the same as Curl_read() but it * blocks until all bytes amount of buffersize will be read. No more, no less. @@ -66,4 +72,6 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, struct connectdata *conn); #endif -#endif /* __SOCKS_H */ +#endif /* CURL_DISABLE_PROXY */ + +#endif /* __CURL_SOCKS_H */ |