diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/getdents64.c | 5 | ||||
| -rw-r--r-- | sysdeps/mach/bits/libc-lock.h | 21 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/sigstack.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/bits/waitflags.h | 30 |
5 files changed, 26 insertions, 40 deletions
diff --git a/sysdeps/generic/getdents64.c b/sysdeps/generic/getdents64.c index 737e8ef80e..7d4faf15ba 100644 --- a/sysdeps/generic/getdents64.c +++ b/sysdeps/generic/getdents64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,95,96,97,99,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include <dirent.h> ssize_t -__getdirentries64 (fd, buf, nbytes, basep) +getdirentries64 (fd, buf, nbytes, basep) int fd; char *buf; size_t nbytes; @@ -31,7 +31,6 @@ __getdirentries64 (fd, buf, nbytes, basep) __set_errno (ENOSYS); return -1; } -weak_alias (__getdirentries64, getdirentries64) stub_warning (getdirentries64) #include <stub-tag.h> diff --git a/sysdeps/mach/bits/libc-lock.h b/sysdeps/mach/bits/libc-lock.h index acee2bf405..7ba326039c 100644 --- a/sysdeps/mach/bits/libc-lock.h +++ b/sysdeps/mach/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Mach cthreads version. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996,97,98,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,6 +62,19 @@ typedef cthread_key_t __libc_key_t; /* Unlock the named lock variable. */ #define __libc_lock_unlock(NAME) __mutex_unlock (&(NAME)) + +/* XXX for now */ +#define __libc_rwlock_define __libc_lock_define +#define __libc_rwlock_define_initialized __libc_lock_define_initialized +#define __libc_rwlock_init __libc_lock_init +#define __libc_rwlock_fini __libc_lock_fini +#define __libc_rwlock_rdlock __libc_lock_lock +#define __libc_rwlock_wrlock __libc_lock_lock +#define __libc_rwlock_tryrdlock __libc_lock_trylock +#define __libc_rwlock_trywrlock __libc_lock_trylock +#define __libc_rwlock_unlock __libc_lock_unlock + + /* Start a critical region with a cleanup function */ #define __libc_cleanup_region_start(FCT, ARG) \ { \ @@ -75,6 +88,12 @@ typedef cthread_key_t __libc_key_t; (*__save_FCT)(__save_ARG); \ } +/* Sometimes we have to exit the block in the middle. */ +#define __libc_cleanup_end(DOIT) \ + if (DOIT) \ + (*__save_FCT)(__save_ARG); \ + + /* Use mutexes as once control variables. */ struct __libc_once diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index ea887674db..d768aec1c5 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. +# Copyright (C) 1993,94,95,96,97,98,99,2000 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -82,7 +82,7 @@ $(common-objpfx)errnos.d: $(mach-errnos-deps) $(mach-errno-h) | \ $(CC) $(CPPFLAGS) -M -x c - | \ sed $(sed-remove-objpfx) -e 's,- *:,mach-errnos-deps :=,' \ - -e 's,\.\./,$(..),g' > $@t + -e 's, \.\./, $(..),g' > $@t mv -f $@t $@ $(hurd)/bits/errno.h: $(common-objpfx)stamp-errnos ; diff --git a/sysdeps/mach/hurd/sigstack.c b/sysdeps/mach/hurd/sigstack.c index 0f5afbaf99..204b12d1f9 100644 --- a/sysdeps/mach/hurd/sigstack.c +++ b/sysdeps/mach/hurd/sigstack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1992,97,98,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,9 +23,7 @@ /* Run signals handlers on the stack specified by SS (if not NULL). If OSS is not NULL, it is filled in with the old signal stack status. */ int -sigstack (ss, oss) - const struct sigstack *ss; - struct sigstack *oss; +sigstack (struct sigstack *ss, struct sigstack *oss) { struct sigaltstack as, oas; diff --git a/sysdeps/unix/bsd/bits/waitflags.h b/sysdeps/unix/bsd/bits/waitflags.h deleted file mode 100644 index e9e6c99214..0000000000 --- a/sysdeps/unix/bsd/bits/waitflags.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Definitions of flag bits for `waitpid' et al. Hurd version. - Copyright (C) 1992, 1996, 1997, 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#if !defined _SYS_WAIT_H && !defined _STDLIB_H< -# error "Never include <bits/waitflags.h> directly; use <sys/wait.h> instead." -#endif - - -/* Bits in the third argument to `waitpid'. */ -#define WNOHANG 1 /* Don't block waiting. */ -#define WUNTRACED 2 /* Report status of stopped children. */ -#ifdef __USE_GNU -# define WNOREAP 4 /* Don't remove record of child reported. */ -#endif |