From 49abdbcda972f959949945f4cd8b16d645c93728 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Hentschel?= Date: Tue, 9 Apr 2019 21:55:47 +0200 Subject: [PATCH] include: Fix vararg standard call types for ARM. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Alexandre Julliard --- include/basetyps.h | 8 ++++---- include/winnt.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index d55005fbd79..94875334b00 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -26,10 +26,10 @@ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#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 diff --git a/include/winnt.h b/include/winnt.h index 29a7372c89e..bdcd90a9ddc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -412,10 +412,10 @@ extern "C++" { \ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#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 -- 2.11.4.GIT