Module: wine Branch: master Commit: 12ead6742f8f32b4b2190cab8437f1b649960e59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ead6742f8f32b4b2190cab8... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:58 2020 +0200 msvcp: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index b2bec6570b..721d02c548 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -263,7 +263,7 @@ static void init_ ## type ## _cxx(char *base) \ #define DEFINE_CXX_DATA4(name, cl1, cl2, cl3, cl4, dtor) \ DEFINE_CXX_DATA(name, 4, cl1, cl2, cl3, cl4, dtor) -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 15a6548b21..e9f6b6b804 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -969,7 +969,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) ep->ref = NULL; } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void call_dtor(const cxx_exception_type *type, void *func, void *object); __ASM_GLOBAL_FUNC( call_dtor, diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index acb13af51c..4fb7ab24c1 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -711,7 +711,7 @@ unsigned int __cdecl _Random_device(void) #endif #if _MSVCP_VER >= 110 -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func, diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index e33fc6434f..677234974e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \