Module: wine Branch: master Commit: 62173699c38453777c7d5638ed2e779790506b75 URL: https://gitlab.winehq.org/wine/wine/-/commit/62173699c38453777c7d5638ed2e779...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 30 12:11:51 2023 +0200
include: Don't align the stack for PE builds.
---
include/msvcrt/corecrt.h | 9 +++------ include/windef.h | 23 +++++++++-------------- 2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index bec9c8911c2..02f3c2f8a09 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -82,7 +82,7 @@ #define __has_attribute(x) 0 #endif
-#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(__MINGW32__) # undef __stdcall # ifdef __i386__ # ifdef __GNUC__ @@ -100,16 +100,13 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__CYGWIN__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ -#endif /* __stdcall */ - -#ifndef _MSC_VER # undef __cdecl # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -120,7 +117,7 @@ # else # define __cdecl __stdcall # endif -#endif +#endif /* _MSC_VER || __MINGW32__ */
#ifndef WINAPIV # if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) diff --git a/include/windef.h b/include/windef.h index cb7eb1179c8..827e9f92a26 100644 --- a/include/windef.h +++ b/include/windef.h @@ -54,7 +54,7 @@ extern "C" { # endif #endif
-#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(__MINGW32__) # undef __stdcall # ifdef __i386__ # ifdef __GNUC__ @@ -72,16 +72,13 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__CYGWIN__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ -#endif /* __stdcall */ - -#ifndef _MSC_VER # undef __cdecl # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -92,15 +89,13 @@ extern "C" { # else # define __cdecl __stdcall # endif -#endif - -#if !defined(_MSC_VER) && !defined(__fastcall) -# define __fastcall __stdcall -#endif - -#if (!defined(_MSC_VER) || !defined(__clang__)) && !defined(__thiscall) -# define __thiscall __stdcall -#endif +# ifndef __fastcall +# define __fastcall __stdcall +# endif +# ifndef __thiscall +# define __thiscall __stdcall +# endif +#endif /* _MSC_VER || __MINGW32__ */
#ifndef __ms_va_list # if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)