Skip to content

W
wine-winehq
Commit 2211de9e authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

include: Avoid redefinition warnings when basetyps.h is used together with winnt.h or objbase.h.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent fe4e6934
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 4 deletions
include/basetyps.h
View file @ 2211de9e
......@@ -31,13 +31,21 @@
#define STDAPICALLTYPE WINAPI
#define STDAPIVCALLTYPE WINAPIV
#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
#define STDAPI_(t) EXTERN_C t STDAPICALLTYPE
#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE
#define STDMETHODIMP HRESULT STDMETHODCALLTYPE
#define STDMETHODIMP_(t) t STDMETHODCALLTYPE
#define STDMETHODIMP_(type) type STDMETHODCALLTYPE
#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
#define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE
#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE
#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
#define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE
#define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE
#undef STDMETHOD
#undef STDMETHOD_
#undef PURE
#undef THIS_
#undef THIS
#undef DECLARE_INTERFACE
#undef DECLARE_INTERFACE_
#if defined(__cplusplus) && !defined(CINTERFACE)
......
include/objbase.h
View file @ 2211de9e
......@@ -170,6 +170,14 @@
* macro is defined in which case we would not be here.
*/
#undef STDMETHOD
#undef STDMETHOD_
#undef PURE
#undef THIS_
#undef THIS
#undef DECLARE_INTERFACE
#undef DECLARE_INTERFACE_
#if defined(__cplusplus) && !defined(CINTERFACE)
#ifdef COM_STDMETHOD_CAN_THROW
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment