From 01a6943da7ddfd43f4343f3a6b3afec2dd18fb50 Mon Sep 17 00:00:00 2001
From: dannysmith <dannysmith>
Date: Tue, 18 Apr 2006 02:57:59 +0000
Subject: [PATCH] 2006-04-18  Bart Oldeman  <bartoldeman@users.sf.net>

	* lib/test.c: Fix typo in #inlcude.
	* include/aclui.h: INTERFACE should not remain
	defined at the end of the header.
	* include/servprov.h: Ditto.
---
 winsup/w32api/ChangeLog          | 7 +++++++
 winsup/w32api/include/aclui.h    | 2 +-
 winsup/w32api/include/servprov.h | 2 +-
 winsup/w32api/lib/test.c         | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8fe599eaaa..608facc5f7 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-18  Bart Oldeman  <bartoldeman@users.sf.net>
+
+	* lib/test.c: Fix typo in #inlcude.
+	* include/aclui.h: INTERFACE should not remain
+	defined at the end of the header.
+	* include/servprov.h: Ditto.
+
 2006-04-16  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/ws2tcpip.h (gai_strerror): Add thread-safety comment.
diff --git a/winsup/w32api/include/aclui.h b/winsup/w32api/include/aclui.h
index 016bc73af0..7502d9162a 100644
--- a/winsup/w32api/include/aclui.h
+++ b/winsup/w32api/include/aclui.h
@@ -98,7 +98,6 @@ typedef enum _SI_PAGE_TYPE
 
 #ifndef __ISecurityInformation_INTERFACE_DEFINED__
 #define __ISecurityInformation_INTERFACE_DEFINED__
-#undef INTERFACE
 #define INTERFACE ISecurityInformation
 DECLARE_INTERFACE_(ISecurityInformation, IUnknown)
 {
@@ -114,6 +113,7 @@ DECLARE_INTERFACE_(ISecurityInformation, IUnknown)
 		STDMETHOD(GetInheritTypes)(THIS_ PSI_INHERIT_TYPE*,ULONG*) PURE;
 		STDMETHOD(PropertySheetPageCallback)(THIS_ HWND,UINT,SI_PAGE_TYPE) PURE;
 };
+#undef INTERFACE
 typedef ISecurityInformation *LPSECURITYINFO;
 #endif
 
diff --git a/winsup/w32api/include/servprov.h b/winsup/w32api/include/servprov.h
index 4905d69e49..76661026b3 100644
--- a/winsup/w32api/include/servprov.h
+++ b/winsup/w32api/include/servprov.h
@@ -10,7 +10,6 @@ extern "C" {
 #endif
 
 EXTERN_C const IID IID_IServiceProvider;
-#undef INTERFACE
 #define INTERFACE IServiceProvider
 DECLARE_INTERFACE_(IServiceProvider,IUnknown)
 {
@@ -19,6 +18,7 @@ DECLARE_INTERFACE_(IServiceProvider,IUnknown)
 	STDMETHOD_(ULONG,Release)(THIS) PURE;
 	STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE;
 };
+#undef INTERFACE
 
 #ifdef COBJMACROS
 #define IServiceProvider_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index cf253d96de..77e3e646e4 100644
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -105,7 +105,7 @@
 #include <mshtml.h>
 #include <servprov.h>
 #include <aclui.h>
-#inlcude <mlang.h>
+#include <mlang.h>
 #else
 #undef BOOL
 #endif
-- 
2.11.0