From 3fc845914ad050fcb78ddb8ab947ddbe3928de2a Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 22 Jul 2016 20:42:20 +0100
Subject: [PATCH] vauth.h: No need to query HAVE_GSSAPI || USE_WINDOWS_SSPI for
 SPNEGO

As SPNEGO is only defined when these pre-processor variables are defined
there is no need to query them explicitly.
---
 lib/vauth/vauth.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index 0c3cc18cb7..38806ee73b 100644
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -164,7 +164,7 @@ CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data,
 void Curl_auth_gssapi_cleanup(struct kerberos5data *krb5);
 #endif /* USE_KERBEROS5 */
 
-#if (defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)) && defined(USE_SPNEGO)
+#if defined(USE_SPNEGO)
 /* This is used to decode a base64 encoded SPNEGO (Negotiate) challenge
    message */
 CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
@@ -184,6 +184,6 @@ CURLcode Curl_auth_create_spnego_message(struct Curl_easy *data,
 /* This is used to clean up the SPNEGO specifiec data */
 void Curl_auth_spnego_cleanup(struct negotiatedata *nego);
 
-#endif /* (HAVE_GSSAPI || USE_WINDOWS_SSPI) && USE_SPNEGO */
+#endif /* USE_SPNEGO */
 
 #endif /* HEADER_CURL_VAUTH_H */
-- 
GitLab