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/mshtml.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/mshtml.h')
| -rw-r--r-- | winsup/w32api/include/mshtml.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/winsup/w32api/include/mshtml.h b/winsup/w32api/include/mshtml.h index 91ff19815..a91eefa03 100644 --- a/winsup/w32api/include/mshtml.h +++ b/winsup/w32api/include/mshtml.h @@ -8,24 +8,24 @@ extern "C" { #endif -typedef interface IHTMLElementCollection *LPHTMLELEMENTCOLLECTION; -typedef interface IHTMLElement *LPHTMLELEMENT; -typedef interface IHTMLSelectionObject *LPHTMLSELECTIONOBJECT; -typedef interface IHTMLFramesCollection *LPHTMLFRAMESCOLLECTION; -typedef interface IHTMLLocation *LPHTMLLOCATION; -typedef interface IHTMLWindow2 *LPHTMLWINDOW2; -typedef interface IHTMLStyleSheetsCollection *LPHTMLSTYLESHEETSCOLLECTION; -typedef interface IHTMLStyleSheet *LPHTMLSTYLESHEET; -typedef interface IHTMLStyle *LPHTMLSTYLE; -typedef interface IHTMLFiltersCollection *LPHTMLFILTERSCOLLECTION; -typedef interface IHTMLLinkElement *LPHTMLLINKELEMENT; -typedef interface IHTMLImgElement *LPHTMLIMGELEMENT; -typedef interface IHTMLImageElementFactory *LPHTMLIMAGEELEMENTFACTORY; -typedef interface IHTMLEventObj *LPHTMLEVENTOBJ; -typedef interface IHTMLScreen *LPHTMLSCREEN; -typedef interface IHTMLOptionElementFactory *LPHTMLOPTIONELEMENTFACTORY; -typedef interface IOmHistory *LPOMHISTORY; -typedef interface IOmNavigator *LPOMNAVIGATOR; +typedef _COM_interface IHTMLElementCollection *LPHTMLELEMENTCOLLECTION; +typedef _COM_interface IHTMLElement *LPHTMLELEMENT; +typedef _COM_interface IHTMLSelectionObject *LPHTMLSELECTIONOBJECT; +typedef _COM_interface IHTMLFramesCollection *LPHTMLFRAMESCOLLECTION; +typedef _COM_interface IHTMLLocation *LPHTMLLOCATION; +typedef _COM_interface IHTMLWindow2 *LPHTMLWINDOW2; +typedef _COM_interface IHTMLStyleSheetsCollection *LPHTMLSTYLESHEETSCOLLECTION; +typedef _COM_interface IHTMLStyleSheet *LPHTMLSTYLESHEET; +typedef _COM_interface IHTMLStyle *LPHTMLSTYLE; +typedef _COM_interface IHTMLFiltersCollection *LPHTMLFILTERSCOLLECTION; +typedef _COM_interface IHTMLLinkElement *LPHTMLLINKELEMENT; +typedef _COM_interface IHTMLImgElement *LPHTMLIMGELEMENT; +typedef _COM_interface IHTMLImageElementFactory *LPHTMLIMAGEELEMENTFACTORY; +typedef _COM_interface IHTMLEventObj *LPHTMLEVENTOBJ; +typedef _COM_interface IHTMLScreen *LPHTMLSCREEN; +typedef _COM_interface IHTMLOptionElementFactory *LPHTMLOPTIONELEMENTFACTORY; +typedef _COM_interface IOmHistory *LPOMHISTORY; +typedef _COM_interface IOmNavigator *LPOMNAVIGATOR; EXTERN_C const IID IID_IHTMLLinkElement; #define INTERFACE IHTMLLinkElement |