JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM.

Browse Source 
* 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'
This commit is contained in:
Danny Smith
2006-07-25 00:22:19 +00:00
parent e7a8c11c0f
commit d2d223b580
20 changed files with 238 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
winsup/w32api/include/objfwd.h
View File

@ -9,48 +9,48 @@
#ifdef __cplusplus
extern "C" {
#endif
typedef interface IMoniker *LPMONIKER;
typedef interface IStream *LPSTREAM;
typedef interface IMarshal *LPMARSHAL;
typedef interface IMalloc *LPMALLOC;
typedef interface IMallocSpy *LPMALLOCSPY;
typedef interface IMessageFilter *LPMESSAGEFILTER;
typedef interface IPersist *LPPERSIST;
typedef interface IPersistStream *LPPERSISTSTREAM;
typedef interface IRunningObjectTable *LPRUNNINGOBJECTTABLE;
typedef interface IBindCtx *LPBINDCTX,*LPBC;
typedef interface IAdviseSink *LPADVISESINK;
typedef interface IAdviseSink2 *LPADVISESINK2;
typedef interface IDataObject *LPDATAOBJECT;
typedef interface IDataAdviseHolder *LPDATAADVISEHOLDER;
typedef interface IEnumMoniker *LPENUMMONIKER;
typedef interface IEnumFORMATETC *LPENUMFORMATETC;
typedef interface IEnumSTATDATA *LPENUMSTATDATA;
typedef interface IEnumSTATSTG *LPENUMSTATSTG;
typedef interface IEnumSTATPROPSTG LPENUMSTATPROPSTG;
typedef interface IEnumString *LPENUMSTRING;
typedef interface IEnumUnknown *LPENUMUNKNOWN;
typedef interface IStorage *LPSTORAGE;
typedef interface IPersistStorage *LPPERSISTSTORAGE;
typedef interface ILockBytes *LPLOCKBYTES;
typedef interface IStdMarshalInfo *LPSTDMARSHALINFO;
typedef interface IExternalConnection *LPEXTERNALCONNECTION;
typedef interface IRunnableObject *LPRUNNABLEOBJECT;
typedef interface IROTData *LPROTDATA;
typedef interface IPersistFile *LPPERSISTFILE;
typedef interface IRootStorage *LPROOTSTORAGE;
typedef interface IRpcChannelBuffer *LPRPCCHANNELBUFFER;
typedef interface IRpcProxyBuffer *LPRPCPROXYBUFFER;
typedef interface IRpcStubBuffer *LPRPCSTUBBUFFER;
typedef interface IPropertyStorage *LPPROPERTYSTORAGE;
typedef interface IEnumSTATPROPSETSTG *LPENUMSTATPROPSETSTG;
typedef interface IPropertySetStorage *LPPROPERTYSETSTORAGE;
typedef interface IClientSecurity *LPCLIENTSECURITY;
typedef interface IServerSecurity *LPSERVERSECURITY;
typedef interface IClassActivator *LPCLASSACTIVATOR;
typedef interface IFillLockBytes *LPFILLLOCKBYTES;
typedef interface IProgressNotify *LPPROGRESSNOTIFY;
typedef interface ILayoutStorage *LPLAYOUTSTORAGE;
typedef _COM_interface IMoniker *LPMONIKER;
typedef _COM_interface IStream *LPSTREAM;
typedef _COM_interface IMarshal *LPMARSHAL;
typedef _COM_interface IMalloc *LPMALLOC;
typedef _COM_interface IMallocSpy *LPMALLOCSPY;
typedef _COM_interface IMessageFilter *LPMESSAGEFILTER;
typedef _COM_interface IPersist *LPPERSIST;
typedef _COM_interface IPersistStream *LPPERSISTSTREAM;
typedef _COM_interface IRunningObjectTable *LPRUNNINGOBJECTTABLE;
typedef _COM_interface IBindCtx *LPBINDCTX,*LPBC;
typedef _COM_interface IAdviseSink *LPADVISESINK;
typedef _COM_interface IAdviseSink2 *LPADVISESINK2;
typedef _COM_interface IDataObject *LPDATAOBJECT;
typedef _COM_interface IDataAdviseHolder *LPDATAADVISEHOLDER;
typedef _COM_interface IEnumMoniker *LPENUMMONIKER;
typedef _COM_interface IEnumFORMATETC *LPENUMFORMATETC;
typedef _COM_interface IEnumSTATDATA *LPENUMSTATDATA;
typedef _COM_interface IEnumSTATSTG *LPENUMSTATSTG;
typedef _COM_interface IEnumSTATPROPSTG LPENUMSTATPROPSTG;
typedef _COM_interface IEnumString *LPENUMSTRING;
typedef _COM_interface IEnumUnknown *LPENUMUNKNOWN;
typedef _COM_interface IStorage *LPSTORAGE;
typedef _COM_interface IPersistStorage *LPPERSISTSTORAGE;
typedef _COM_interface ILockBytes *LPLOCKBYTES;
typedef _COM_interface IStdMarshalInfo *LPSTDMARSHALINFO;
typedef _COM_interface IExternalConnection *LPEXTERNALCONNECTION;
typedef _COM_interface IRunnableObject *LPRUNNABLEOBJECT;
typedef _COM_interface IROTData *LPROTDATA;
typedef _COM_interface IPersistFile *LPPERSISTFILE;
typedef _COM_interface IRootStorage *LPROOTSTORAGE;
typedef _COM_interface IRpcChannelBuffer *LPRPCCHANNELBUFFER;
typedef _COM_interface IRpcProxyBuffer *LPRPCPROXYBUFFER;
typedef _COM_interface IRpcStubBuffer *LPRPCSTUBBUFFER;
typedef _COM_interface IPropertyStorage *LPPROPERTYSTORAGE;
typedef _COM_interface IEnumSTATPROPSETSTG *LPENUMSTATPROPSETSTG;
typedef _COM_interface IPropertySetStorage *LPPROPERTYSETSTORAGE;
typedef _COM_interface IClientSecurity *LPCLIENTSECURITY;
typedef _COM_interface IServerSecurity *LPSERVERSECURITY;
typedef _COM_interface IClassActivator *LPCLASSACTIVATOR;
typedef _COM_interface IFillLockBytes *LPFILLLOCKBYTES;
typedef _COM_interface IProgressNotify *LPPROGRESSNOTIFY;
typedef _COM_interface ILayoutStorage *LPLAYOUTSTORAGE;
#ifdef __cplusplus
}
#endif