From 9333ed0d5846e90035395de2723e6e7069ac9946 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 24 Dec 2005 20:07:27 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/bits/errno.h: Define EOWNERDEAD and ENOTRECOVERABLE if not already defined. --- ChangeLog | 5 +++++ nptl/ChangeLog | 4 ++++ nptl/version.c | 4 ++-- sysdeps/unix/sysv/linux/bits/errno.h | 11 ++++++++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d705f28d8..53cf28f074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-24 Ulrich Drepper + + * sysdeps/unix/sysv/linux/bits/errno.h: Define EOWNERDEAD and + ENOTRECOVERABLE if not already defined. + 2005-12-23 Ulrich Drepper [BZ #1566] diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 74cf9a9c57..a41ce03284 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2005-12-24 Ulrich Drepper + + * version.c: Update cpoyright year. + 2005-12-23 Ulrich Drepper * pthread_mutex_destroy.c: Set mutex type to an invalid value. diff --git a/nptl/version.c b/nptl/version.c index f2fd25fd6d..1be6b7f4a5 100644 --- a/nptl/version.c +++ b/nptl/version.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -23,7 +23,7 @@ static const char banner[] = #include "banner.h" -"Copyright (C) 2003 Free Software Foundation, Inc.\n\ +"Copyright (C) 2005 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ PARTICULAR PURPOSE.\n" diff --git a/sysdeps/unix/sysv/linux/bits/errno.h b/sysdeps/unix/sysv/linux/bits/errno.h index 724dabaf10..4de8cbba57 100644 --- a/sysdeps/unix/sysv/linux/bits/errno.h +++ b/sysdeps/unix/sysv/linux/bits/errno.h @@ -1,5 +1,5 @@ /* Error constants. Linux specific version. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2005 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 @@ -27,12 +27,17 @@ /* Linux has no ENOTSUP error code. */ # define ENOTSUP EOPNOTSUPP -/* Linux also had no ECANCELED error code. Since it is not used here - we define it to an invalid value. */ +/* Older Linux versions also had no ECANCELED error code. */ # ifndef ECANCELED # define ECANCELED 125 # endif +/* Support for error codes to support robust mutexes was added later, too. */ +# ifndef EOWNERDEAD +# define EOWNERDEAD 130 +# define ENOTRECOVERABLE 131 +# endif + # ifndef __ASSEMBLER__ /* Function to get address of global `errno' variable. */ extern int *__errno_location (void) __THROW __attribute__ ((__const__));