msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
3f8ac955 · Jacek Caban · Alexandre Julliard · ddd4a7c3 · 3f8ac955 · 3f8ac955
Commit 3f8ac955 authored Apr 24, 2020 by Jacek Caban Committed by Alexandre Julliard Apr 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 12 deletions

cpp.c dlls/msvcrt/cpp.c +2 -6

scheduler.c dlls/msvcrt/scheduler.c +2 -6

No files found.
--- 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

--- 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)
 {