diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-04-18 06:57:59 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-04-18 06:57:59 +0400 |
| commit | bcc39a0bfe336f2d7dea2dd6453865f13015a10b (patch) | |
| tree | 759ae595b2ea757e1e45fc12a9b28f3ec07a909f /winsup | |
| parent | d1efa4e819ad8e44964a99a1625498d3faf3b2c3 (diff) | |
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.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/aclui.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/servprov.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/lib/test.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 8fe599eaa..608facc5f 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 016bc73af..7502d9162 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 4905d69e4..76661026b 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 cf253d96d..77e3e646e 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 |