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/ocidl.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/ocidl.h')
| -rw-r--r-- | winsup/w32api/include/ocidl.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/winsup/w32api/include/ocidl.h b/winsup/w32api/include/ocidl.h index 0e6398742..79f6b43d4 100644 --- a/winsup/w32api/include/ocidl.h +++ b/winsup/w32api/include/ocidl.h @@ -10,16 +10,16 @@ extern "C" { #include <ole2.h> -typedef interface IErrorLog *LPERRORLOG; -typedef interface IPropertyBag *LPPROPERTYBAG; -typedef interface IPropertyBag2 *LPPROPERTYBAG2; -typedef interface IEnumConnections *LPENUMCONNECTIONS; -typedef interface IConnectionPoint *LPCONNECTIONPOINT; -typedef interface IEnumConnectionPoints *LPENUMCONNECTIONPOINTS; -typedef interface IPropertyPageSite *LPPROPERTYPAGESITE; -typedef interface IFont *LPFONT; -typedef interface IFontDisp *LPFONTDISP; -typedef interface IOleUndoManager *LPOLEUNDOMANAGER; +typedef _COM_interface IErrorLog *LPERRORLOG; +typedef _COM_interface IPropertyBag *LPPROPERTYBAG; +typedef _COM_interface IPropertyBag2 *LPPROPERTYBAG2; +typedef _COM_interface IEnumConnections *LPENUMCONNECTIONS; +typedef _COM_interface IConnectionPoint *LPCONNECTIONPOINT; +typedef _COM_interface IEnumConnectionPoints *LPENUMCONNECTIONPOINTS; +typedef _COM_interface IPropertyPageSite *LPPROPERTYPAGESITE; +typedef _COM_interface IFont *LPFONT; +typedef _COM_interface IFontDisp *LPFONTDISP; +typedef _COM_interface IOleUndoManager *LPOLEUNDOMANAGER; #ifndef OLE2ANSI typedef TEXTMETRICW TEXTMETRICOLE; @@ -73,21 +73,21 @@ typedef enum tagQACONTAINERFLAGS typedef struct tagQACONTAINER { ULONG cbSize; - interface IOleClientSite *pClientSite; - interface IAdviseSinkEx *pAdviseSink; - interface IPropertyNotifySink *pPropertyNotifySink; + _COM_interface IOleClientSite *pClientSite; + _COM_interface IAdviseSinkEx *pAdviseSink; + _COM_interface IPropertyNotifySink *pPropertyNotifySink; IUnknown *pUnkEventSink; DWORD dwAmbientFlags; OLE_COLOR colorFore; OLE_COLOR colorBack; - interface IFont *pFont; - interface IOleUndoManager *pUndoMgr; + _COM_interface IFont *pFont; + _COM_interface IOleUndoManager *pUndoMgr; DWORD dwAppearance; LONG lcid; HPALETTE hpal; - interface IBindHost *pBindHost; - interface IOleControlSite *pOleControlSite; - interface IServiceProvider *pServiceProvider; + _COM_interface IBindHost *pBindHost; + _COM_interface IOleControlSite *pOleControlSite; + _COM_interface IServiceProvider *pServiceProvider; } QACONTAINER; typedef struct tagQACONTROL { |