From cdef3287dba7702f7c379101c769e587d3a14e4c Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 4 Mar 2015 13:48:55 +0900 Subject: [PATCH] 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 0a1241c258b..e34a9e3d22b 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 fe45bf6bc4d..12a7f846e6a 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 e649f0317de..8f31f24881b 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