schannel: Moved interal struct types to urldata.h

Moved type definitions in order to avoid inclusion loop

diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c
index d4e35596608727f3de176fe76e53dad81a02b95f..d4d7629c10abb5a33e8d6726b07dbaec6e43370a 100644 (file)
--- a/lib/curl_schannel.c
+++ b/lib/curl_schannel.c
@@ -56,7 +56,6 @@
 #ifdef USE_WINDOWS_SSPI
 #ifdef USE_SCHANNEL
 
-#include "urldata.h"
 #include "curl_sspi.h"
 #include "curl_schannel.h"
 #include "sslgen.h"

diff --git a/lib/curl_schannel.h b/lib/curl_schannel.h
index fa6fc90c2623e6207e3d6600cde6fd3e306530f9..aea47b292c4d3a7044e31e99195fd3edc352c3cc 100644 (file)
--- a/lib/curl_schannel.h
+++ b/lib/curl_schannel.h
@@ -26,21 +26,13 @@
 #ifdef USE_WINDOWS_SSPI
 #ifdef USE_SCHANNEL
 
-#include <schnlsp.h>
+#include "urldata.h"
 
 #ifndef UNISP_NAME_A
 #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
 #endif
 
-typedef struct curl_schannel_cred {
-  CredHandle cred_handle;
-  TimeStamp time_stamp;
-} curl_schannel_cred;
 
-typedef struct curl_schannel_ctxt {
-  CtxtHandle ctxt_handle;
-  TimeStamp time_stamp;
-} curl_schannel_ctxt;
 
 CURLcode Curl_schannel_connect(struct connectdata *conn, int sockindex);
 

diff --git a/lib/urldata.h b/lib/urldata.h
index 2b972d5eec199a4db4627ac1f14f21ca7c9b469d..7327482df54313b269772e22c39788f2cc58816d 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -133,7 +133,8 @@
 
 #ifdef USE_SCHANNEL
 #include "curl_sspi.h"
-#include "curl_schannel.h"
+#include <schnlsp.h>
+#include <schannel.h>
 #endif
 
 #ifdef HAVE_NETINET_IN_H
@@ -219,6 +220,19 @@ enum protection_level {
 };
 #endif
 
+#ifdef USE_SCHANNEL
+/* Structs to store Schannel handles */
+typedef struct curl_schannel_cred {
+  CredHandle cred_handle;
+  TimeStamp time_stamp;
+} curl_schannel_cred;
+
+typedef struct curl_schannel_ctxt {
+  CtxtHandle ctxt_handle;
+  TimeStamp time_stamp;
+} curl_schannel_ctxt;
+#endif
+
 /* enum for the nonblocking SSL connection state machine */
 typedef enum {
   ssl_connect_1,