Module: wine Branch: master Commit: 2211de9eeb38503db0f5b47e111c9dd6c5f71585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2211de9eeb38503db0f5b47e1... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 01:28:50 2020 +0200 include: Avoid redefinition warnings when basetyps.h is used together with winnt.h or objbase.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetyps.h | 32 ++++++++++++++++++++------------ include/objbase.h | 8 ++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index 18e15dcabd..b0dd5d77f4 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -26,18 +26,26 @@ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE WINAPI -#define STDMETHODVCALLTYPE WINAPIV -#define STDAPICALLTYPE WINAPI -#define STDAPIVCALLTYPE WINAPIV -#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE -#define STDAPI_(t) EXTERN_C t STDAPICALLTYPE -#define STDMETHODIMP HRESULT STDMETHODCALLTYPE -#define STDMETHODIMP_(t) t STDMETHODCALLTYPE -#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE -#define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE -#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE -#define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE +#define STDMETHODCALLTYPE WINAPI +#define STDMETHODVCALLTYPE WINAPIV +#define STDAPICALLTYPE WINAPI +#define STDAPIVCALLTYPE WINAPIV +#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE +#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE +#define STDMETHODIMP HRESULT STDMETHODCALLTYPE +#define STDMETHODIMP_(type) type STDMETHODCALLTYPE +#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE +#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE +#define STDMETHODIMPV HRESULT 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) diff --git a/include/objbase.h b/include/objbase.h index a17cbeb870..e5a6b2a9fa 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -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