diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 00:22:19 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 00:22:19 +0000 |
| commit | d2d223b5802d14e040edec3bff7a10b5eb15d96b (patch) | |
| tree | d59dc3b926d78d2c98285dfbd41ffc91fd43a8cd /winsup/w32api/include/objidl.h | |
| parent | e7a8c11c0fa11eb9eac20a1fc279bcce03b77409 (diff) | |
| download | cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.tar.gz cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.tar.bz2 cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.zip | |
* 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'
Diffstat (limited to 'winsup/w32api/include/objidl.h')
| -rw-r--r-- | winsup/w32api/include/objidl.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |