summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/bits/setjmp.h2
-rw-r--r--arch/i386/bits/setjmp.h2
-rw-r--r--arch/microblaze/bits/setjmp.h2
-rw-r--r--arch/mips/bits/setjmp.h2
-rw-r--r--arch/powerpc/bits/setjmp.h2
-rw-r--r--arch/x86_64/bits/setjmp.h2
-rw-r--r--include/setjmp.h13
-rw-r--r--src/signal/siglongjmp.c2
-rw-r--r--src/signal/sigsetjmp.c2
9 files changed, 14 insertions, 15 deletions
diff --git a/arch/arm/bits/setjmp.h b/arch/arm/bits/setjmp.h
index 3938cb8a..55e3a95b 100644
--- a/arch/arm/bits/setjmp.h
+++ b/arch/arm/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf[32];
+typedef unsigned long long __jmp_buf[32];
diff --git a/arch/i386/bits/setjmp.h b/arch/i386/bits/setjmp.h
index 5610be9b..decd26dc 100644
--- a/arch/i386/bits/setjmp.h
+++ b/arch/i386/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long jmp_buf[6];
+typedef unsigned long __jmp_buf[6];
diff --git a/arch/microblaze/bits/setjmp.h b/arch/microblaze/bits/setjmp.h
index 8f0376b2..b2bd9748 100644
--- a/arch/microblaze/bits/setjmp.h
+++ b/arch/microblaze/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long jmp_buf[18];
+typedef unsigned long __jmp_buf[18];
diff --git a/arch/mips/bits/setjmp.h b/arch/mips/bits/setjmp.h
index 6bb15464..467872e9 100644
--- a/arch/mips/bits/setjmp.h
+++ b/arch/mips/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf [15];
+typedef unsigned long long __jmp_buf[15];
diff --git a/arch/powerpc/bits/setjmp.h b/arch/powerpc/bits/setjmp.h
index ab583aba..1cb0f26d 100644
--- a/arch/powerpc/bits/setjmp.h
+++ b/arch/powerpc/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf [56];
+typedef unsigned long long __jmp_buf[56];
diff --git a/arch/x86_64/bits/setjmp.h b/arch/x86_64/bits/setjmp.h
index 81d4968a..63973a80 100644
--- a/arch/x86_64/bits/setjmp.h
+++ b/arch/x86_64/bits/setjmp.h
@@ -1 +1 @@
-typedef unsigned long jmp_buf[8];
+typedef unsigned long __jmp_buf[8];
diff --git a/include/setjmp.h b/include/setjmp.h
index 5456d8f8..0da27de6 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -9,27 +9,26 @@ extern "C" {
#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 defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| 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];
+typedef jmp_buf sigjmp_buf;
int sigsetjmp (sigjmp_buf, int);
_Noreturn void siglongjmp (sigjmp_buf, int);
#endif
-
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
int _setjmp (jmp_buf);
_Noreturn void _longjmp (jmp_buf, int);
#endif
-
int setjmp (jmp_buf);
_Noreturn void longjmp (jmp_buf, int);
diff --git a/src/signal/siglongjmp.c b/src/signal/siglongjmp.c
index a7bcca24..2974ff7f 100644
--- a/src/signal/siglongjmp.c
+++ b/src/signal/siglongjmp.c
@@ -7,5 +7,5 @@
_Noreturn void siglongjmp(sigjmp_buf buf, int ret)
{
if (buf->__fl) __restore_sigs(buf->__ss);
- longjmp(buf->__jb, ret);
+ longjmp(buf, ret);
}
diff --git a/src/signal/sigsetjmp.c b/src/signal/sigsetjmp.c
index 01ba0dff..6a5f6f15 100644
--- a/src/signal/sigsetjmp.c
+++ b/src/signal/sigsetjmp.c
@@ -11,5 +11,5 @@ int sigsetjmp(sigjmp_buf buf, int save)
{
if ((buf->__fl = save))
pthread_sigmask(SIG_SETMASK, 0, (sigset_t *)buf->__ss);
- return setjmp(buf->__jb);
+ return setjmp(buf);
}