Alexandre Julliard : msvcrt: Undefine __thiscall before redefining it.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cdef3287dba7702f7c379101c769e587d3a14e4c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cdef3287dba7702f7c379101c7...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Mar  4 13:48:55 2015 +0900

msvcrt: Undefine __thiscall before redefining it.

---

 dlls/msvcp60/cxx.h | 3 ++-
 dlls/msvcp90/cxx.h | 3 ++-
 dlls/msvcrt/cxx.h  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h
index 0a1241c..e34a9e3 100644
--- a/dlls/msvcp60/cxx.h
+++ b/dlls/msvcp60/cxx.h
@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Copied from dlls/msvcrt/cpp.c */
+/* Copied from dlls/msvcrt/cxx.h */
+#undef __thiscall
 #ifdef __i386__  /* thiscall functions are i386-specific */
 
 #define THISCALL(func) __thiscall_ ## func
diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h
index fe45bf6..12a7f84 100644
--- a/dlls/msvcp90/cxx.h
+++ b/dlls/msvcp90/cxx.h
@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Copied from dlls/msvcrt/cpp.c */
+/* Copied from dlls/msvcrt/cxx.h */
+#undef __thiscall
 #ifdef __i386__  /* thiscall functions are i386-specific */
 
 #define THISCALL(func) __thiscall_ ## func
diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h
index e649f03..8f31f24 100644
--- a/dlls/msvcrt/cxx.h
+++ b/dlls/msvcrt/cxx.h
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#undef __thiscall
 #ifdef __i386__  /* thiscall functions are i386-specific */
 
 #define THISCALL(func) __thiscall_ ## func