diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 04:22:19 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 04:22:19 +0400 |
| commit | d2d223b5802d14e040edec3bff7a10b5eb15d96b (patch) | |
| tree | d59dc3b926d78d2c98285dfbd41ffc91fd43a8cd /winsup/w32api/include/comcat.h | |
| parent | e7a8c11c0fa11eb9eac20a1fc279bcce03b77409 (diff) | |
* 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/comcat.h')
| -rw-r--r-- | winsup/w32api/include/comcat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/w32api/include/comcat.h b/winsup/w32api/include/comcat.h index 2ca9a5fbb..b5d982b7e 100644 --- a/winsup/w32api/include/comcat.h +++ b/winsup/w32api/include/comcat.h @@ -16,7 +16,7 @@ extern "C"{ #endif EXTERN_C const IID IID_IEnumGUID; -typedef interface IEnumGUID *LPENUMGUID; +typedef _COM_interface IEnumGUID *LPENUMGUID; #define INTERFACE IEnumGUID DECLARE_INTERFACE_(IEnumGUID,IUnknown) @@ -79,13 +79,13 @@ EXTERN_C const CATID CATID_DesignTimeUIActivatableControl; #define IID_IEnumCLSID IID_IEnumGUID EXTERN_C const IID IID_ICatInformation; -typedef interface ICatInformation *LPCATINFORMATION; +typedef _COM_interface ICatInformation *LPCATINFORMATION; EXTERN_C const IID IID_ICatRegister; -typedef interface ICatRegister *LPCATREGISTER; +typedef _COM_interface ICatRegister *LPCATREGISTER; EXTERN_C const IID IID_IEnumCATEGORYINFO; -typedef interface IEnumCATEGORYINFO *LPENUMCATEGORYINFO; +typedef _COM_interface IEnumCATEGORYINFO *LPENUMCATEGORYINFO; EXTERN_C const CLSID CLSID_StdComponentCategoriesMgr; |