Skip to content

W
wine-winehq
Commit 1c04cbfd authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro.

parent 913b075b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 17 deletions
dlls/msvcp90/exception.c
View file @ 1c04cbfd
......@@ -64,20 +64,12 @@ void WINAPI _CxxThrowException(exception*,const cxx_exception_type*);
#ifdef _WIN64
#define __ASM_EXCEPTION_VTABLE(name) \
__ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) )
#define __ASM_EXCEPTION_STRING_VTABLE(name) \
__ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_logic_error_what) )
#define __ASM_EXCEPTION_VTABLE(name, what_func) \
__ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) )
#else
#define __ASM_EXCEPTION_VTABLE(name) \
__ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) )
#define __ASM_EXCEPTION_STRING_VTABLE(name) \
__ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_logic_error_what) )
#define __ASM_EXCEPTION_VTABLE(name, what_func) \
__ASM_VTABLE(name, "\t.long " THISCALL_NAME(what_func) )
#endif /* _WIN64 */
extern const vtable_ptr MSVCP_bad_alloc_vtable;
......@@ -688,11 +680,11 @@ static const cxx_exception_type invalid_argument_cxx_type = {
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
#endif
__ASM_EXCEPTION_VTABLE(bad_alloc);
__ASM_EXCEPTION_STRING_VTABLE(logic_error);
__ASM_EXCEPTION_STRING_VTABLE(length_error);
__ASM_EXCEPTION_STRING_VTABLE(out_of_range);
__ASM_EXCEPTION_STRING_VTABLE(invalid_argument);
__ASM_EXCEPTION_VTABLE(bad_alloc, MSVCP_what_exception);
__ASM_EXCEPTION_VTABLE(logic_error, MSVCP_logic_error_what);
__ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what);
__ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what);
__ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what);
#ifndef __GNUC__
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment