only enable NTLM if HTTP and NTLM is not disabled, and if NTLM is disabled

we define an empty macro for the ntlm cleanup function
This commit is contained in:
Daniel Stenberg 2005-11-23 11:51:31 +00:00
parent 599d9642ca
commit cfff544d67
2 changed files with 3 additions and 2 deletions

View File

@ -39,8 +39,7 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header);
CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy);
void Curl_ntlm_cleanup(struct connectdata *conn);
#if (!defined(USE_SSLEAY) && !defined(USE_WINDOWS_SSPI)) || \
defined(CURL_DISABLE_HTTP)
#ifndef USE_NTLM
#define Curl_ntlm_cleanup(x)
#endif

View File

@ -301,9 +301,11 @@ typedef int curl_socket_t;
#define USE_SSL /* Either OpenSSL || GnuTLS */
#endif
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM)
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI)
#define USE_NTLM
#endif
#endif
#ifdef CURLDEBUG
#define DEBUGF(x) x