Francois Gouget : secur32: sspi.h must not include wtypes.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ea483682c5608947140cfe16d1df3f355d27f2b3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea483682c5608947140cfe16d1df3f355d27f2b3

Author: Francois Gouget <fgouget at free.fr>
Date:   Wed Nov  8 00:59:30 2006 +0100

secur32: sspi.h must not include wtypes.h.

---

 dlls/rpcrt4/rpc_epmap.c      |    2 +-
 dlls/secur32/tests/ntlm.c    |    2 ++
 dlls/secur32/tests/secur32.c |    1 +
 include/sspi.h               |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c
index 70e4038..93e3e60 100644
--- a/dlls/rpcrt4/rpc_epmap.c
+++ b/dlls/rpcrt4/rpc_epmap.c
@@ -251,7 +251,7 @@ typedef unsigned int unsigned32;
 typedef struct twr_t
     {
     unsigned32 tower_length;
-    /* [size_is] */ byte tower_octet_string[ 1 ];
+    /* [size_is] */ BYTE tower_octet_string[ 1 ];
     } 	twr_t;
 
 RPC_STATUS WINAPI TowerExplode(
diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c
index 7fa9358..47a4888 100644
--- a/dlls/secur32/tests/ntlm.c
+++ b/dlls/secur32/tests/ntlm.c
@@ -30,6 +30,8 @@ #include <windef.h>
 #include <winbase.h>
 #define SECURITY_WIN32
 #include <sspi.h>
+#include <rpc.h>
+#include <rpcdce.h>
 
 #include "wine/test.h"
 
diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c
index da20af3..57f2ee1 100644
--- a/dlls/secur32/tests/secur32.c
+++ b/dlls/secur32/tests/secur32.c
@@ -21,6 +21,7 @@ #include <stdio.h>
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
+#include <winnls.h>
 #define SECURITY_WIN32
 #include <security.h>
 #include <schannel.h>
diff --git a/include/sspi.h b/include/sspi.h
index 704d1a0..e743d99 100644
--- a/include/sspi.h
+++ b/include/sspi.h
@@ -18,7 +18,7 @@
 #ifndef __WINE_SSPI_H__
 #define __WINE_SSPI_H__
 
-#include <wtypes.h>
+/* FIXME: #include <sdkddkver.h> */
 
 #ifdef __cplusplus
 extern "C" {