X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fsetjmp.h;h=1976af231b8c4acee1a4115c20afb48d12a85d6a;hb=dc9285ad1dc19349c407072cc48ba70dab86de45;hp=e5877b4468f90f4c39efa1d959451f12534cdf7d;hpb=0c05bd3a9c165cf2f0b9d6fa23a1f96532ddcdb3;p=musl

diff --git a/include/setjmp.h b/include/setjmp.h
index e5877b44..1976af23 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -5,41 +5,42 @@
 extern "C" {
 #endif
 
-#if __STDC_VERSION__ >= 201112L
-#elif defined(__GNUC__)
-#define _Noreturn __attribute__((__noreturn__))
-#else
-#define _Noreturn
-#endif
+#include <features.h>
 
 #include <bits/setjmp.h>
 
+typedef struct __jmp_buf_tag {
+	__jmp_buf __jb;
+	unsigned long __fl;
+	unsigned long __ss[128/sizeof(long)];
+} jmp_buf[1];
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+#define __setjmp_attr __attribute__((__returns_twice__))
+#else
+#define __setjmp_attr
+#endif
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
  || defined(_BSD_SOURCE)
-typedef struct {
-	jmp_buf __jb;
-	unsigned long __fl;
-	unsigned long __ss[128/sizeof(long)];
-} sigjmp_buf[1];
-int sigsetjmp (sigjmp_buf, int);
+typedef jmp_buf sigjmp_buf;
+int sigsetjmp (sigjmp_buf, int) __setjmp_attr;
 _Noreturn void siglongjmp (sigjmp_buf, int);
 #endif
 
-
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
  || defined(_BSD_SOURCE)
-int _setjmp (jmp_buf);
+int _setjmp (jmp_buf) __setjmp_attr;
 _Noreturn void _longjmp (jmp_buf, int);
 #endif
 
-
-int setjmp (jmp_buf);
+int setjmp (jmp_buf) __setjmp_attr;
 _Noreturn void longjmp (jmp_buf, int);
 
 #define setjmp setjmp
-#define longjmp longjmp
+
+#undef __setjmp_attr
 
 #ifdef __cplusplus
 }