msvcp90/tests: Don't redefine __thiscall.

Nicolas Le Cam niko.lecam at gmail.com
Sun Mar 4 17:05:27 CST 2012


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 7499671d70b97b632969230f6f00aeae0b2fa0d6 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   |    2 ++
 dlls/msvcp90/tests/string.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c
index 688f344..8487185 100644
--- a/dlls/msvcp90/tests/misc.c
+++ b/dlls/msvcp90/tests/misc.c
@@ -60,11 +60,13 @@ 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);
 
+#ifndef __thiscall
 #ifdef __i386__
 #define __thiscall __stdcall
 #else
 #define __thiscall __cdecl
 #endif
+#endif
 
 static char* (__thiscall *p_char_address)(void*, char*);
 static void* (__thiscall *p_char_ctor)(void*);
diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c
index 6857dee..1fed50f 100644
--- a/dlls/msvcp90/tests/string.c
+++ b/dlls/msvcp90/tests/string.c
@@ -52,11 +52,13 @@ 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*);
 
+#ifndef __thiscall
 #ifdef __i386__
 #define __thiscall __stdcall
 #else
 #define __thiscall __cdecl
 #endif
+#endif
 
 static basic_string_char* (__thiscall *p_basic_string_char_ctor)(basic_string_char*);
 static basic_string_char* (__thiscall *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*);
-- 
1.7.9.1


More information about the wine-patches mailing list