diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-01-03 16:13:21 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-01-03 16:13:21 +0000 |
| commit | 35c2fd59ba2ed8f0cece3760155bb4f0aaba7bd0 (patch) | |
| tree | c9ca7f0d3f3065d5ae9844afc9e542f29e9eba85 | |
| parent | 305bb37e1e4d39fe9e515fc5543fefea7c4e9653 (diff) | |
| download | glibc-35c2fd59ba2ed8f0cece3760155bb4f0aaba7bd0.tar.gz glibc-35c2fd59ba2ed8f0cece3760155bb4f0aaba7bd0.tar.xz glibc-35c2fd59ba2ed8f0cece3760155bb4f0aaba7bd0.zip | |
* posix/unistd.h (ctermid): Remove __nonnull attribute.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 10 | ||||
| -rw-r--r-- | posix/unistd.h | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index ed01b76522..b8079b7773 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-03 Jakub Jelinek <jakub@redhat.com> + + * posix/unistd.h (ctermid): Remove __nonnull attribute. + 2006-01-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (PTR_MANGLE, diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b59fc5b2fb..f7a770f15a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2006-01-03 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/pthread/pthread.h [__WORDSIZE==64]: Don't use cast in + mutex initializers. + 2006-01-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/tls.h (tcbhead_t): Add pointer_guard field. diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 5413661eb3..d887e37aee 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 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 @@ -74,14 +74,14 @@ enum /* Mutex initializers. */ #if __WORDSIZE == 64 # define PTHREAD_MUTEX_INITIALIZER \ - { { 0, 0, 0, 0, 0, 0, (void *) 0, (void *) 0 } } + { { 0, 0, 0, 0, 0, 0, 0, 0 } } # ifdef __USE_GNU # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ - { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, (void *) 0, (void *) 0 } } + { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, 0, 0 } } # define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \ - { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, (void *) 0, (void *) 0 } } + { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, 0, 0 } } # define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \ - { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, (void *) 0, (void *) 0 } } + { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, 0, 0 } } # endif #else # define PTHREAD_MUTEX_INITIALIZER \ diff --git a/posix/unistd.h b/posix/unistd.h index 9684126eaa..4c03c4d702 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2002,2003,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-2002,2003,2004,2005,2006 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 @@ -1075,7 +1075,7 @@ extern void swab (__const void *__restrict __from, void *__restrict __to, It is also found in <stdio.h>. */ #ifdef __USE_XOPEN /* Return the name of the controlling terminal. */ -extern char *ctermid (char *__s) __THROW __nonnull ((1)); +extern char *ctermid (char *__s) __THROW; #endif |