diff options
| author | Roland McGrath <roland@gnu.org> | 2005-12-06 01:38:34 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-12-06 01:38:34 +0000 |
| commit | 2ce7e666e9f64730bdac1be1c7b43c2375d82826 (patch) | |
| tree | 44573949c5a491a52c743d125574e9e27d550fa6 /sysdeps/m68k | |
| parent | a6ba1c33efd5895cb35b0e68027b74786f161cfe (diff) | |
| download | glibc-2ce7e666e9f64730bdac1be1c7b43c2375d82826.zip glibc-2ce7e666e9f64730bdac1be1c7b43c2375d82826.tar.gz glibc-2ce7e666e9f64730bdac1be1c7b43c2375d82826.tar.bz2 | |
* 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.
2005-11-12 Jim Meyering <jim@meyering.net>
* sysdeps/unix/opendir.c (__alloc_dir): Declare STATP parameter
to be pointer to const.
* include/dirent.h: Update decl.
Diffstat (limited to 'sysdeps/m68k')
| -rw-r--r-- | sysdeps/m68k/bits/setjmp.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/m68k/bits/setjmp.h b/sysdeps/m68k/bits/setjmp.h index 2c2b3ee..193eec3 100644 --- a/sysdeps/m68k/bits/setjmp.h +++ b/sysdeps/m68k/bits/setjmp.h @@ -17,8 +17,10 @@ 02111-1307 USA. */ /* Define the machine-dependent type `jmp_buf'. m68k 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 @@ -44,3 +46,5 @@ typedef struct containing a local variable at ADDRESS. */ #define _JMPBUF_UNWINDS(jmpbuf, address) \ ((void *) (address) < (void *) (jmpbuf)->__sp) + +#endif /* bits/setjmp.h */ |