aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/hppa
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-12-06 01:38:24 +0000
committerRoland McGrath <roland@gnu.org>2005-12-06 01:38:24 +0000
commitf6023225d0f05eb07aead4f02133a769ce6d1fcb (patch)
tree96fe51427aff15f8cf6f8bf061c41a7bf231bc26 /sysdeps/hppa
parentd3fcfbb038aa0093c65f0579394718c81047d328 (diff)
downloadglibc-f6023225d0f05eb07aead4f02133a769ce6d1fcb.tar
glibc-f6023225d0f05eb07aead4f02133a769ce6d1fcb.tar.gz
glibc-f6023225d0f05eb07aead4f02133a769ce6d1fcb.tar.bz2
glibc-f6023225d0f05eb07aead4f02133a769ce6d1fcb.zip
2005-11-15 Mike Frysinger <vapier@gentoo.org>
* sysdeps/hppa/bits/setjmp.h: Add _BITS_SETJMP_H preprocessor protection and allow pthread.h to include bits/setjmp.h as well as setjmp.h. * sysdeps/m68k/bits/setjmp.h: Likewise. * sysdeps/s390/bits/setjmp.h: Make sure only setjmp.h or pthread.h are allow to include bits/setjmp.h. * sysdeps/mips/bits/setjmp.h (_JMPBUF_UNWINDS): Cast rhs to match lhs cast of address. * sysdeps/sh/bits/setjmp.h: Likewise.
Diffstat (limited to 'sysdeps/hppa')
-rw-r--r--sysdeps/hppa/bits/setjmp.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/hppa/bits/setjmp.h b/sysdeps/hppa/bits/setjmp.h
index 7fb2af77d0..4395b8f562 100644
--- a/sysdeps/hppa/bits/setjmp.h
+++ b/sysdeps/hppa/bits/setjmp.h
@@ -17,8 +17,10 @@
02111-1307 USA. */
/* Define the machine-dependent type `jmp_buf'. HPPA version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -39,3 +41,5 @@ typedef double __jmp_buf[21];
variable at ADDRESS. */
#define _JMPBUF_UNWINDS(_jmpbuf, _address) \
((void *)(_address) > (void *)(((unsigned long *) _jmpbuf)[JB_SP]))
+
+#endif /* bits/setjmp.h */