summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/i960/bits
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-11-16 04:55:24 +0000
committerMike Frysinger <vapier@gentoo.org>2005-11-16 04:55:24 +0000
commit222c137f6c9b60712db90366efc09a543fde4c8e (patch)
tree9e245fe3dd043e7d568260a0730dcce648c55ea2 /libc/sysdeps/linux/i960/bits
parent3bfee14cbcba28a59cbba450de579f171ee3d443 (diff)
update copyright and license, add _BITS_SETJMP_H protection around the file, make sure we are only included by setjmp.h and pthread.h, and fix casting of address/jumpbugf in _JMPBUF_UNWINDS
Diffstat (limited to 'libc/sysdeps/linux/i960/bits')
-rw-r--r--libc/sysdeps/linux/i960/bits/setjmp.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/i960/bits/setjmp.h b/libc/sysdeps/linux/i960/bits/setjmp.h
index 29fe2439f..f90e4cec7 100644
--- a/libc/sysdeps/linux/i960/bits/setjmp.h
+++ b/libc/sysdeps/linux/i960/bits/setjmp.h
@@ -1,6 +1,9 @@
/* Define the machine-dependent type `jmp_buf'. i960 version. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -29,5 +32,7 @@ typedef struct __jmp_buf__ {
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((void *) (address) < (jmpbuf)[0].__sp)
+ ((void *) (address) < (void *) (jmpbuf)[0].__sp)
#endif
+
+#endif /* bits/setjmp.h */