msvcp90/tests: Don't redefine __thiscall (try 2).

Nicolas Le Cam niko.lecam at gmail.com
Tue Mar 13 18:35:37 CDT 2012


Try 2: Just undefine __thiscall before using our own definition.

Fixes warnings on mingw-w64:
../../../../../src/dlls/msvcp90/tests/misc.c:64:0: warning:
"__thiscall" redefined [enabled by default]
<built-in>:0:0: note: this is the location of the previous definition
../../../../../src/dlls/msvcp90/tests/string.c:56:0: warning:
"__thiscall" redefined [enabled by default]
<built-in>:0:0: note: this is the location of the previous definition

-- 
Nicolas Le Cam
-------------- next part --------------
From 7f97f1137ccc7513bad45a787703e5c9904348fe Mon Sep 17 00:00:00 2001
From: Nicolas Le Cam <niko.lecam at gmail.com>
Date: Thu, 1 Mar 2012 22:18:33 +0100
Subject: 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
-- 
1.7.9.1


More information about the wine-patches mailing list