* 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.
This commit is contained in:
Roland McGrath 2005-12-06 01:38:34 +00:00
parent a6ba1c33ef
commit 2ce7e666e9
8 changed files with 36 additions and 6 deletions

View File

@ -1,3 +1,21 @@
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.
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.
2005-12-05 Roland McGrath <roland@redhat.com>
* hurd/hurdmalloc.c: Remove $ tag $ magic.

View File

@ -25,6 +25,6 @@ extern int __alphasort64 (const void *a, const void *b)
__attribute_pure__;
extern int __versionsort64 (const void *a, const void *b)
__attribute_pure__;
extern DIR *__alloc_dir (int fd, bool close_fd, struct stat64 *statp)
extern DIR *__alloc_dir (int fd, bool close_fd, const struct stat64 *statp)
internal_function;
#endif

View File

@ -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 */

View File

@ -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 */

View File

@ -81,6 +81,6 @@ typedef struct
/* 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 /* _MIPS_BITS_SETJMP_H */

View File

@ -21,6 +21,10 @@
#ifndef __S390_SETJMP_H__
#define __S390_SETJMP_H__
#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
#include <bits/wordsize.h>
#define __JB_GPR6 0

View File

@ -51,6 +51,6 @@ typedef struct
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (jmpbuf)[0].__regs[7])
((void *) (address) < (void *) (jmpbuf)[0].__regs[7])
#endif /* bits/setjmp.h */

View File

@ -139,7 +139,7 @@ weak_alias (__opendir, opendir)
DIR *
internal_function
__alloc_dir (int fd, bool close_fd, struct stat64 *statp)
__alloc_dir (int fd, bool close_fd, const struct stat64 *statp)
{
if (__builtin_expect (__fcntl (fd, F_SETFD, FD_CLOEXEC), 0) < 0)
goto lose;