=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: include: Fix vararg standard call types for ARM.
Alexandre Julliard
julliard at winehq.org
Fri Aug 23 09:31:23 CDT 2019
Module: wine
Branch: stable
Commit: ce799d6b154586a838f457df8971ac4edcced97b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce799d6b154586a838f457df8971ac4edcced97b
Author: André Hentschel <nerv at dawncrow.de>
Date: Tue Apr 9 21:55:47 2019 +0200
include: Fix vararg standard call types for ARM.
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 49abdbcda972f959949945f4cd8b16d645c93728)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 d55005f..9487533 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 20e8a85..115cc29 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
More information about the wine-cvs
mailing list