Jacek Caban : msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.

Alexandre Julliard julliard at winehq.org
Fri Apr 24 15:11:39 CDT 2020


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Apr 24 20:10:16 2020 +0200

msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.

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

---

 dlls/msvcirt/msvcirt.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 797b0b1b56..360d34653f 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -199,9 +199,7 @@ extern const vtable_ptr MSVCP_strstream_vtable;
 /* ??_7stdiostream@@6B@ */
 extern const vtable_ptr MSVCP_stdiostream_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+__ASM_BLOCK_BEGIN(vtables)
     __ASM_VTABLE(streambuf,
             VTABLE_ADD_FUNC(streambuf_vector_dtor)
             VTABLE_ADD_FUNC(streambuf_sync)
@@ -270,9 +268,7 @@ void __asm_dummy_vtables(void) {
             VTABLE_ADD_FUNC(iostream_vector_dtor));
     __ASM_VTABLE(stdiostream,
             VTABLE_ADD_FUNC(iostream_vector_dtor));
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment))
 #define VBTABLE_ENTRY(class, offset, vbase) ALIGNED_SIZE(sizeof(class), TYPE_ALIGNMENT(vbase))-offset




More information about the wine-cvs mailing list