msvcp90: 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>

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

Showing with 8 additions and 24 deletions

exception.c dlls/msvcp90/exception.c +2 -6

ios.c dlls/msvcp90/ios.c +2 -6

locale.c dlls/msvcp90/locale.c +2 -6

misc.c dlls/msvcp90/misc.c +2 -6

No files found.
--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -1021,9 +1021,7 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep)
 #define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs VTABLE_ADD_FUNC(MSVCP_exception__Doraise))
 #endif
-#ifndef __GNUC__
+__ASM_BLOCK_BEGIN(exception_vtables)
-void __asm_dummy_vtables(void) {
-#endif
    __ASM_VTABLE(type_info,
            VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor));
    EXCEPTION_VTABLE(exception,
@@ -1066,9 +1064,7 @@ void __asm_dummy_vtables(void) {
    EXCEPTION_VTABLE(range_error,
            VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor)
            VTABLE_ADD_FUNC(MSVCP_runtime_error_what));
-#ifndef __GNUC__
+__ASM_BLOCK_END
-}
-#endif
 /* Internal: throws selected exception */
 void throw_exception(exception_type et, const char *str)

--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -756,9 +756,7 @@ DEFINE_RTTI_DATA8(strstream, sizeof(strstream),
        &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor,
        "?AVstrstream@std@@")
-#ifndef __GNUC__
+__ASM_BLOCK_BEGIN(ios_vtables)
-void __asm_dummy_vtables(void) {
-#endif
    __ASM_VTABLE(iosb,
            VTABLE_ADD_FUNC(iosb_vector_dtor));
    __ASM_VTABLE(ios_base,
@@ -1181,9 +1179,7 @@ void __asm_dummy_vtables(void) {
            VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
 #endif
            );
-#ifndef __GNUC__
+__ASM_BLOCK_END
-}
-#endif
 /* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEXPAD00@Z */
 /* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAXPEAD00@Z */

--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -12737,9 +12737,7 @@ DEFINE_RTTI_DATA1(time_base, 0, &locale_facet_rtti_base_descriptor, ".?AUtime_ba
 DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@")
 DEFINE_RTTI_DATA2(time_get_wchar, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@")
-#ifndef __GNUC__
+__ASM_BLOCK_BEGIN(locale_vtables)
-void __asm_dummy_vtables(void) {
-#endif
    __ASM_VTABLE(_Facet_base,
            VTABLE_ADD_FUNC(locale_facet_vector_dtor)
            VTABLE_ADD_FUNC(locale_facet__Incref)
@@ -13104,9 +13102,7 @@ void __asm_dummy_vtables(void) {
            VTABLE_ADD_FUNC(time_get_wchar_do_get)
 #endif
            );
-#ifndef __GNUC__
+__ASM_BLOCK_END
-}
-#endif
 void init_locale(void *base)
 {

--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -2391,9 +2391,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_swap(
 }
 #endif
-#ifndef __GNUC__
+__ASM_BLOCK_BEGIN(vtables)
-void __asm_dummy_vtables(void) {
-#endif
 #if _MSVCP_VER == 100
    __ASM_VTABLE(iostream_category,
            VTABLE_ADD_FUNC(custom_category_vector_dtor)
@@ -2434,9 +2432,7 @@ void __asm_dummy_vtables(void) {
    __ASM_VTABLE(_Pad,
            VTABLE_ADD_FUNC(_Pad__Go));
 #endif
-#ifndef __GNUC__
+__ASM_BLOCK_END
-}
-#endif
 /*********************************************************************
 *  __crtInitializeCriticalSectionEx (MSVCP140.@)