From d2d223b5802d14e040edec3bff7a10b5eb15d96b Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 25 Jul 2006 00:22:19 +0000 Subject: * include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM. * include/basetyps.h: Likewise. (_COM_interface): New define. (interface): Define to _COM_interface, conditional on !__OBJC__. Replace 'interface' with '_COM_interface', throughout. * include/comcat.h: Replace 'interface' with '_COM_interface', throughout. * include/commdlg.h: Replace __OBJC__ guard with _OBJC_NO_COM. * include/docobj.h: Replace 'interface' with '_COM_interface', throughout. * include/mshtml.h: Likewise. * include/oaidl.h: Likewise. * include/objfwd.h: Likewise. * include/objidl.h: Likewise. * include/ocidl.h: Likwise. * include/olectl.h: Likewise. * include/oleidl.h: Likewise. * include/shlobj.h: Likewise. * include/shlwapi.h: Replace __OBJC__ guard with _OBJC_NO_COM. * include/vfw.h: Likewise. * include/windows.h. Likewise. Add comment. * include/directx/d3d9.h: Replace 'interface' with '_COM_interface', throughout. * lib/test.c: Replace __OBJC__ guard with _OBJC_NO_COM. Add test for conflict with '@interface' --- winsup/w32api/include/objidl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/w32api/include/objidl.h') diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h index 4ac935a12..8d7040467 100644 --- a/winsup/w32api/include/objidl.h +++ b/winsup/w32api/include/objidl.h @@ -458,7 +458,7 @@ DECLARE_ENUMERATOR(STATPROPSETSTG); DECLARE_ENUMERATOR(STATPROPSTG); DECLARE_ENUMERATOR(STATSTG); DECLARE_ENUMERATOR_(IEnumString,LPOLESTR); -DECLARE_ENUMERATOR_(IEnumMoniker,interface IMoniker*); +DECLARE_ENUMERATOR_(IEnumMoniker,_COM_interface IMoniker*); DECLARE_ENUMERATOR_(IEnumUnknown,IUnknown*); EXTERN_C const IID IID_ISequentialStream; @@ -854,7 +854,7 @@ DECLARE_INTERFACE_(IPSFactoryBuffer,IUnknown) STDMETHOD(CreateStub)(THIS_ REFIID,LPUNKNOWN,LPRPCSTUBBUFFER*) PURE; }; #undef INTERFACE -typedef interface IPSFactoryBuffer *LPPSFACTORYBUFFER; +typedef _COM_interface IPSFactoryBuffer *LPPSFACTORYBUFFER; EXTERN_C const IID IID_ILockBytes; #define INTERFACE ILockBytes -- cgit v1.2.3