Module: wine Branch: master Commit: 3acd943275d3293df2d5159eb4238e40c1d91645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acd943275d3293df2d5159eb...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Apr 23 15:40:54 2020 +0200
windef.h: Use __thiscall keyword on Clang with MSVC target.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/windef.h | 2 +- include/wine/asm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/windef.h b/include/windef.h index 689163accc..436ac6afd8 100644 --- a/include/windef.h +++ b/include/windef.h @@ -102,7 +102,7 @@ extern "C" { # define __fastcall __stdcall #endif
-#ifndef __thiscall +#if (!defined(_MSC_VER) || !defined(__clang__)) && !defined(__thiscall) # define __thiscall __stdcall #endif
diff --git a/include/wine/asm.h b/include/wine/asm.h index 3f5a685bb6..a036744674 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -96,7 +96,7 @@
/* thiscall support */
-#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__))
# ifdef _MSC_VER # define DEFINE_THISCALL_WRAPPER(func,args) \