Nicolas Le Cam : msvcp90/tests: Don't redefine __thiscall.
Alexandre Julliard
julliard at winehq.org
Wed Mar 14 13:56:10 CDT 2012
Module: wine
Branch: master
Commit: 99db789eda402ab3665b2f66b09de720ef102e5c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db789eda402ab3665b2f66b09de720ef102e5c
Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date: Thu Mar 1 22:18:33 2012 +0100
msvcp90/tests: Don't redefine __thiscall.
---
dlls/msvcp90/tests/misc.c | 1 +
dlls/msvcp90/tests/string.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c
index 688f344..e7f88c5 100644
--- a/dlls/msvcp90/tests/misc.c
+++ b/dlls/msvcp90/tests/misc.c
@@ -60,6 +60,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t);
static unsigned short (__cdecl *p_wctype)(const char*);
static MSVCP__Ctypevec (__cdecl *p__Getctype)(void);
+#undef __thiscall
#ifdef __i386__
#define __thiscall __stdcall
#else
diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c
index 6857dee..8bc5f18 100644
--- a/dlls/msvcp90/tests/string.c
+++ b/dlls/msvcp90/tests/string.c
@@ -52,6 +52,7 @@ static void* (__cdecl *p_set_invalid_parameter_handler)(void*);
static basic_string_char* (__cdecl *p_basic_string_char_concatenate)(basic_string_char*, const basic_string_char*, const basic_string_char*);
static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_string_char*, const basic_string_char*, const char*);
+#undef __thiscall
#ifdef __i386__
#define __thiscall __stdcall
#else
More information about the wine-cvs
mailing list