diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2012-04-13 13:04:53 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-06-11 19:00:34 +0200 |
| commit | 8d78848a3986919754223bc0dcbeb216e33bffb2 (patch) | |
| tree | 1a03c7740a66736b255564e80e5e1921357b638f | |
| parent | 90412c86133aa32250749882891750b4555e97f6 (diff) | |
schannel: Moved interal struct types to urldata.h
Moved type definitions in order to avoid inclusion loop
| -rw-r--r-- | lib/curl_schannel.c | 1 | ||||
| -rw-r--r-- | lib/curl_schannel.h | 10 | ||||
| -rw-r--r-- | lib/urldata.h | 16 |
3 files changed, 16 insertions, 11 deletions
diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c index d4e355966..d4d7629c1 100644 --- 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 fa6fc90c2..aea47b292 100644 --- 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 2b972d5ee..7327482df 100644 --- 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, |