diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-08-24 23:04:57 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-08-24 23:04:57 +0000 |
| commit | 110af2d2db9861e3f65b13a9c03eb1f2b47c43db (patch) | |
| tree | aba0a72ed7909276a5e26ec4de56edeaf52c39a3 /winsup/w32api/include/unknwn.h | |
| parent | c94e99621da9c7f5ae9f0d60f62db42f78a76d1f (diff) | |
| download | cygnal-110af2d2db9861e3f65b13a9c03eb1f2b47c43db.tar.gz cygnal-110af2d2db9861e3f65b13a9c03eb1f2b47c43db.tar.bz2 cygnal-110af2d2db9861e3f65b13a9c03eb1f2b47c43db.zip | |
2003-08-24 Danny Smith <dannysmith@users.sourceforge.net>
* include/objidl.h (COBJMACROS): Define macros only
if using C interace.
* include/unknwn.h: Ditto.
* include/comcat.h: Ditto.
2003-08-24 Filip Navara <xnavara@volny.cz>
* include/prsht.h (PSH_WIZARDHASFINISH, PSH_WIZARD_LITE,
PSH_NOCONTEXTHELP): Define.
(PSH_WIZARD97): Fix definition for _WIN32_IE >= 0x500.
* include/winuser.h (DFCS_TRANSPARENT, DFCS_HOT): Define.
(LPDLGTEMPLATE[AW]): Add typedefs.
Diffstat (limited to 'winsup/w32api/include/unknwn.h')
| -rw-r--r-- | winsup/w32api/include/unknwn.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/w32api/include/unknwn.h b/winsup/w32api/include/unknwn.h index 203d4d316..20a75afc5 100644 --- a/winsup/w32api/include/unknwn.h +++ b/winsup/w32api/include/unknwn.h @@ -58,7 +58,9 @@ HRESULT STDMETHODCALLTYPE IClassFactory_CreateInstance_Proxy(IClassFactory*,IUnk HRESULT STDMETHODCALLTYPE IClassFactory_CreateInstance_Stub(IClassFactory*,REFIID,IUnknown**); HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Proxy(IClassFactory*,BOOL); HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Stub(IClassFactory*,BOOL); -#ifdef COBJMACROS + +#if (!defined (__cplusplus) || defined (CINTERFACE)) \ + && defined (COBJMACROS) #define IUnknown_QueryInterface(T,r,O) (T)->lpVtbl->QueryInterface(T,r,O) #define IUnknown_AddRef(T) (T)->lpVtbl->AddRef(T) #define IUnknown_Release(T) (T)->lpVtbl->Release(T) @@ -67,7 +69,7 @@ HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Stub(IClassFactory*,BOOL); #define IClassFactory_Release(T) (T)->lpVtbl->Release(T) #define IClassFactory_CreateInstance(T,p,r,O) (T)->lpVtbl->CreateInstance(T,p,r,O) #define IClassFactory_LockServer(T,f) (T)->lpVtbl->LockServer(T,f) -#endif +#endif /* COBJMACROS */ #ifdef __cplusplus } #endif |