André Hentschel : include: Add else cases for __cdecl.

Alexandre Julliard julliard at winehq.org
Wed Jun 17 15:54:03 CDT 2020


Module: wine
Branch: master
Commit: 557b81116d8843415eb2cc7d0ca4c34946593dc4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=557b81116d8843415eb2cc7d0ca4c34946593dc4

Author: André Hentschel <nerv at dawncrow.de>
Date:   Wed Jun 17 15:09:34 2020 +0200

include: Add else cases for __cdecl.

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/msvcrt/corecrt.h | 2 ++
 include/windef.h         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index c98b72f7d3..ad46c56591 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -100,6 +100,8 @@
 #   define __cdecl __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__)
 #  define __cdecl __attribute__((ms_abi))
+# else
+#  define __cdecl
 # endif
 #endif /* __cdecl */
 
diff --git a/include/windef.h b/include/windef.h
index 7ece7c8628..521c3ab451 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -93,7 +93,7 @@ extern "C" {
 #   define __cdecl __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__)
 #  define __cdecl __attribute__((ms_abi))
-# elif !defined(_MSC_VER)
+# else
 #  define __cdecl
 # endif
 #endif /* __cdecl */




More information about the wine-cvs mailing list