Jacek Caban : msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3f8ac955de59da9f81a17ccf9d20c7402d6b1773
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3f8ac955de59da9f81a17ccf9...

Author: Jacek Caban 
Date:   Fri Apr 24 20:10:47 2020 +0200

msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.

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

---

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

diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 404aa1146e..500549c31e 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -991,9 +991,7 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor(

#endif /* _MSVCR_VER >= 100 */

-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+__ASM_BLOCK_BEGIN(vtables)

__ASM_VTABLE(type_info,
         VTABLE_ADD_FUNC(MSVCRT_type_info_vector_dtor));
@@ -1041,9 +1039,7 @@ __ASM_VTABLE(improper_scheduler_detach,
         VTABLE_ADD_FUNC(MSVCRT_what_exception));
 #endif

-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END

DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" )
 #if _MSVCR_VER >= 80
diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c
index 08a3242e6b..68003e03f6 100644
--- a/dlls/msvcrt/scheduler.c
+++ b/dlls/msvcrt/scheduler.c
@@ -1094,9 +1094,7 @@ DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedu
 DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor,
         &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler@details@Concurrency@@")

-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+__ASM_BLOCK_BEGIN(scheduler_vtables)
     __ASM_VTABLE(ExternalContextBase,
             VTABLE_ADD_FUNC(ExternalContextBase_GetId)
             VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId)
@@ -1125,9 +1123,7 @@ void __asm_dummy_vtables(void) {
             VTABLE_ADD_FUNC(ThreadScheduler_IsAvailableLocation)
 #endif
             );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END

void msvcrt_init_scheduler(void *base)
 {