Jacek Caban : msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 95e117b3dcd604b544b816c230a4ee8252f0f2f9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=95e117b3dcd604b544b816c23...

Author: Jacek Caban 
Date:   Mon Apr 27 02:31:12 2020 +0200

msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro.

Signed-off-by: Jacek Caban 
Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msvcrt/cpp.c       | 2 +-
 dlls/msvcrt/scheduler.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 500549c31e..16efc88755 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -1713,7 +1713,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/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c
index 68003e03f6..59e177b5ae 100644
--- a/dlls/msvcrt/scheduler.c
+++ b/dlls/msvcrt/scheduler.c
@@ -1058,7 +1058,7 @@ void __cdecl _CurrentScheduler__ScheduleTask(void (__cdecl *proc)(void*), void *
     CurrentScheduler_ScheduleTask(proc, data);
 }

-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER

#define DEFINE_VTBL_WRAPPER(off)            \
     __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \