Jacek Caban : setjmp.h: Use GCC-style setjmp on Clang in MSVC mode.

Alexandre Julliard julliard at winehq.org
Fri Dec 11 15:06:37 CST 2020


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Dec 11 17:36:24 2020 +0100

setjmp.h: Use GCC-style setjmp on Clang in MSVC mode.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/msvcrt/setjmp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h
index d4b7f8019ab..b539b22058f 100644
--- a/include/msvcrt/setjmp.h
+++ b/include/msvcrt/setjmp.h
@@ -149,7 +149,7 @@ _ACRTIMP void __cdecl longjmp(jmp_buf,int);
 # ifdef _UCRT
 #  define _setjmpex __intrinsic_setjmpex
 # endif
-# ifdef __GNUC__
+# if defined(__GNUC__) || defined(__clang__)
 _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*);
 # define setjmp(buf)   _setjmpex(buf,__builtin_frame_address(0))
 # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0))
@@ -158,7 +158,7 @@ _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(j
 # ifdef _UCRT
 #  define _setjmp __intrinsic_setjmp
 # endif
-# ifdef __GNUC__
+# if defined(__GNUC__) || defined(__clang__)
 _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf);
 # else
 _ACRTIMP int __cdecl _setjmp(jmp_buf);




More information about the wine-cvs mailing list