Andrew Talbot : msvcp90: Superfluous semicolons fix.
Alexandre Julliard
julliard at winehq.org
Mon Nov 7 13:30:41 CST 2011
Module: wine
Branch: master
Commit: 43bbce728ab60fe24c2ecc19cd55aec036090dc3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bbce728ab60fe24c2ecc19cd55aec036090dc3
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sat Nov 5 20:54:30 2011 +0000
msvcp90: Superfluous semicolons fix.
---
dlls/msvcp90/exception.c | 10 +++++-----
dlls/msvcp90/memory.c | 20 ++++++++++----------
dlls/msvcp90/msvcp90.h | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c
index 100ceed..00fb0f0 100644
--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -688,11 +688,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);
+ __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);
#ifndef __GNUC__
}
#endif
diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c
index 85d80ae..4ecc379 100644
--- a/dlls/msvcp90/memory.c
+++ b/dlls/msvcp90/memory.c
@@ -61,7 +61,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy)
/* ??4?$allocator at D@std@@QAEAAV01 at ABV01@@Z */
/* ??4?$allocator at D@std@@QEAAAEAV01 at AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8)
void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign)
{
return this;
@@ -69,7 +69,7 @@ void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign)
/* ?deallocate@?$allocator at D@std@@QAEXPADI at Z */
/* ?deallocate@?$allocator at D@std@@QEAAXPEAD_K at Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12)
void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size)
{
MSVCRT_operator_delete(ptr);
@@ -77,7 +77,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz
/* ?allocate@?$allocator at D@std@@QAEPADI at Z */
/* ?allocate@?$allocator at D@std@@QEAAPEAD_K at Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8)
char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
{
return MSVCRT_operator_new(sizeof(char[count]));
@@ -85,7 +85,7 @@ char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
/* ?allocate@?$allocator at D@std@@QAEPADIPBX at Z */
/* ?allocate@?$allocator at D@std@@QEAAPEAD_KPEBX at Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12)
char* __thiscall MSVCP_allocator_char_allocate_hint(void *this,
MSVCP_size_t count, const void *hint)
{
@@ -95,7 +95,7 @@ char* __thiscall MSVCP_allocator_char_allocate_hint(void *this,
/* ?construct@?$allocator at D@std@@QAEXPADABD at Z */
/* ?construct@?$allocator at D@std@@QEAAXPEADAEBD at Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12)
void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val)
{
*ptr = *val;
@@ -103,14 +103,14 @@ void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char
/* ?destroy@?$allocator at D@std@@QAEXPAD at Z */
/* ?destroy@?$allocator at D@std@@QEAAXPEAD at Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8)
void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr)
{
}
/* ?max_size@?$allocator at D@std@@QBEIXZ */
/* ?max_size@?$allocator at D@std@@QEBA_KXZ */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4)
MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this)
{
return UINT_MAX/sizeof(char);
@@ -315,7 +315,7 @@ MSVCP_size_t __thiscall MSVCP_allocator_short_max_size(void *this)
/* allocator<void> */
/* ??0?$allocator at X@std@@QAE at XZ */
/* ??0?$allocator at X@std@@QEAA at XZ */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4)
void* __thiscall MSVCP_allocator_void_ctor(void *this)
{
return this;
@@ -323,7 +323,7 @@ void* __thiscall MSVCP_allocator_void_ctor(void *this)
/* ??0?$allocator at X@std@@QAE at ABV01@@Z */
/* ??0?$allocator at X@std@@QEAA at AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8)
void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy)
{
return this;
@@ -331,7 +331,7 @@ void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy)
/* ??4?$allocator at X@std@@QAEAAV01 at ABV01@@Z */
/* ??4?$allocator at X@std@@QEAAAEAV01 at AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8);
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8)
void* __thiscall MSVCP_allocator_void_assign(void *this, void *assign)
{
return this;
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h
index 1365223..b9000a4 100644
--- a/dlls/msvcp90/msvcp90.h
+++ b/dlls/msvcp90/msvcp90.h
@@ -73,7 +73,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
"\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
__ASM_NAME("MSVCP_" #name "_vtable") ":\n" \
"\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \
- funcs "\n\t.text");
+ funcs "\n\t.text")
#else
@@ -84,7 +84,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
"\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
__ASM_NAME("MSVCP_" #name "_vtable") ":\n" \
"\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \
- funcs "\n\t.text");
+ funcs "\n\t.text")
#endif /* _WIN64 */
More information about the wine-cvs
mailing list