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.
This commit is contained in:
parent
d1efa4e819
commit
bcc39a0bfe
|
@ -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>
|
2006-04-16 Danny Smith <dannysmith@users.sourceforge.net>
|
||||||
|
|
||||||
* include/ws2tcpip.h (gai_strerror): Add thread-safety comment.
|
* include/ws2tcpip.h (gai_strerror): Add thread-safety comment.
|
||||||
|
|
|
@ -98,7 +98,6 @@ typedef enum _SI_PAGE_TYPE
|
||||||
|
|
||||||
#ifndef __ISecurityInformation_INTERFACE_DEFINED__
|
#ifndef __ISecurityInformation_INTERFACE_DEFINED__
|
||||||
#define __ISecurityInformation_INTERFACE_DEFINED__
|
#define __ISecurityInformation_INTERFACE_DEFINED__
|
||||||
#undef INTERFACE
|
|
||||||
#define INTERFACE ISecurityInformation
|
#define INTERFACE ISecurityInformation
|
||||||
DECLARE_INTERFACE_(ISecurityInformation, IUnknown)
|
DECLARE_INTERFACE_(ISecurityInformation, IUnknown)
|
||||||
{
|
{
|
||||||
|
@ -114,6 +113,7 @@ DECLARE_INTERFACE_(ISecurityInformation, IUnknown)
|
||||||
STDMETHOD(GetInheritTypes)(THIS_ PSI_INHERIT_TYPE*,ULONG*) PURE;
|
STDMETHOD(GetInheritTypes)(THIS_ PSI_INHERIT_TYPE*,ULONG*) PURE;
|
||||||
STDMETHOD(PropertySheetPageCallback)(THIS_ HWND,UINT,SI_PAGE_TYPE) PURE;
|
STDMETHOD(PropertySheetPageCallback)(THIS_ HWND,UINT,SI_PAGE_TYPE) PURE;
|
||||||
};
|
};
|
||||||
|
#undef INTERFACE
|
||||||
typedef ISecurityInformation *LPSECURITYINFO;
|
typedef ISecurityInformation *LPSECURITYINFO;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
EXTERN_C const IID IID_IServiceProvider;
|
EXTERN_C const IID IID_IServiceProvider;
|
||||||
#undef INTERFACE
|
|
||||||
#define INTERFACE IServiceProvider
|
#define INTERFACE IServiceProvider
|
||||||
DECLARE_INTERFACE_(IServiceProvider,IUnknown)
|
DECLARE_INTERFACE_(IServiceProvider,IUnknown)
|
||||||
{
|
{
|
||||||
|
@ -19,6 +18,7 @@ DECLARE_INTERFACE_(IServiceProvider,IUnknown)
|
||||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||||
STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE;
|
STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE;
|
||||||
};
|
};
|
||||||
|
#undef INTERFACE
|
||||||
|
|
||||||
#ifdef COBJMACROS
|
#ifdef COBJMACROS
|
||||||
#define IServiceProvider_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
|
#define IServiceProvider_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
|
||||||
|
|
|
@ -105,7 +105,7 @@
|
||||||
#include <mshtml.h>
|
#include <mshtml.h>
|
||||||
#include <servprov.h>
|
#include <servprov.h>
|
||||||
#include <aclui.h>
|
#include <aclui.h>
|
||||||
#inlcude <mlang.h>
|
#include <mlang.h>
|
||||||
#else
|
#else
|
||||||
#undef BOOL
|
#undef BOOL
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue