summaryrefslogtreecommitdiffstats
path: root/libc/sysdeps/linux/i960/bits/setjmp.h
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-11-18 03:14:53 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-11-18 03:14:53 +0000
commitf87c7bd4133a2b3ad9b45c32fab33d167a348c4b (patch)
tree7259957b97704c375b3d8ab42f8da3d52665845e /libc/sysdeps/linux/i960/bits/setjmp.h
parent164a928b77f596b6617a4bbf43a2c06bc35a5602 (diff)
downloaduClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.bz2
uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.xz
Massive merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/i960/bits/setjmp.h')
-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 */