From 110af2d2db9861e3f65b13a9c03eb1f2b47c43db Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sun, 24 Aug 2003 23:04:57 +0000 Subject: 2003-08-24 Danny Smith * include/objidl.h (COBJMACROS): Define macros only if using C interace. * include/unknwn.h: Ditto. * include/comcat.h: Ditto. 2003-08-24 Filip Navara * 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. --- winsup/w32api/include/objidl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'winsup/w32api/include/objidl.h') diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h index 326915cb1..f33f8a319 100644 --- a/winsup/w32api/include/objidl.h +++ b/winsup/w32api/include/objidl.h @@ -1410,7 +1410,9 @@ HRESULT STDMETHODCALLTYPE ILockBytes_ReadAt_Proxy(ILockBytes*,ULARGE_INTEGER,voi HRESULT STDMETHODCALLTYPE ILockBytes_ReadAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*); HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Proxy(ILockBytes*,ULARGE_INTEGER,const void*,ULONG,ULONG*); HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*); -#ifdef COBJMACROS + +#if (!defined (__cplusplus) || defined (CINTERFACE)) \ + && defined (COBJMACROS) #define IMarshal_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p) #define IMarshal_AddRef(This) (This)->lpVtbl->AddRef(This) #define IMarshal_Release(This) (This)->lpVtbl->Release(This) -- cgit v1.2.3