[GNUnet-SVN] [gnurl] 79/256: urldata.h: move SSPI-specific #include to correct location

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 20c6cf7e951e70d4c456bd4171b9f25f04f23a87
Author: Johannes Schindelin <address@hidden>
AuthorDate: Sun Jul 30 23:19:19 2017 +0200

    urldata.h: move SSPI-specific #include to correct location
    
    In 86b889485 (sasl_gssapi: Added GSS-API based Kerberos V5 variables,
    2014-12-03), an SSPI-specific field was added to the kerberos5data
    struct without moving the #include "curl_sspi.h" later in the same file.
    
    This broke the build when SSPI was enabled, unless Secure Channel was
    used as SSL backend, because it just so happens that Secure Channel also
    requires "curl_sspi.h" to be #included.
    
    In f4739f639 (urldata: include curl_sspi.h when Windows SSPI is enabled,
    2017-02-21), this bug was fixed incorrectly: Instead of moving the
    appropriate conditional #include, the Secure Channel-conditional part
    was now also SSPI-conditional.
    
    Fix this problem by moving the correct #include instead.
    
    This is also required for an upcoming patch that moves all the Secure
    Channel-specific stuff out of urldata.h and encapsulates it properly in
    vtls/schannel.c instead.
    
    Signed-off-by: Johannes Schindelin <address@hidden>
---
 lib/urldata.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/urldata.h b/lib/urldata.h
index 67f8e69e9..0d0010fa7 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -407,6 +407,10 @@ struct curl_ssl_session {
   struct ssl_primary_config ssl_config; /* setup for this session */
 };
 
+#ifdef USE_WINDOWS_SSPI
+#include "curl_sspi.h"
+#endif
+
 /* Struct used for Digest challenge-response authentication */
 struct digestdata {
 #if defined(USE_WINDOWS_SSPI)
@@ -438,10 +442,6 @@ typedef enum {
   NTLMSTATE_LAST
 } curlntlm;
 
-#ifdef USE_WINDOWS_SSPI
-#include "curl_sspi.h"
-#endif
-
 #if defined(CURL_DOES_CONVERSIONS) && defined(HAVE_ICONV)
 #include <iconv.h>
 #endif

-- 
To stop receiving notification emails like this one, please contact
address@hidden