fix some obscure header type size/alignment issues

[musl] / include / setjmp.h

diff --git a/include/setjmp.h b/include/setjmp.h
index a5bb1e2..5456d8f 100644 (file)
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -5,28 +5,33 @@
 extern "C" {
 #endif
 
+#include <features.h>
+
 #include <bits/setjmp.h>
 
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-typedef unsigned long sigjmp_buf[(1024+sizeof(jmp_buf))/sizeof(long)];
-#ifdef _GNU_SOURCE
-#define jmp_buf sigjmp_buf
-#endif
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+typedef struct __sigjmp_buf {
+       jmp_buf __jb;
+       unsigned long __fl;
+       unsigned long __ss[128/sizeof(long)];
+} sigjmp_buf[1];
 int sigsetjmp (sigjmp_buf, int);
-void siglongjmp (sigjmp_buf, int);
+_Noreturn void siglongjmp (sigjmp_buf, int);
 #endif
 
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
 int _setjmp (jmp_buf);
-void _longjmp (jmp_buf, int);
+_Noreturn void _longjmp (jmp_buf, int);
 #endif
 
 
 int setjmp (jmp_buf);
-void longjmp (jmp_buf, int);
+_Noreturn void longjmp (jmp_buf, int);
 
 #define setjmp setjmp
 #define longjmp longjmp