diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-02-02 09:48:26 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-02-02 09:48:26 +0000 |
| commit | ce28a8ab09cdd49890261d37b5b9280131d18014 (patch) | |
| tree | c8ba4212f852ffa7ae3aaf87b3a316612e2c401b /nptl | |
| parent | a544f6724f8a668e4e2c4e47b5d8b87a47c67db7 (diff) | |
Updated to fedora-glibc-20070202T0923cvs/fedora-glibc-2_5_90-16
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/pthread_join.c | 4 | ||||
| -rw-r--r-- | nptl/tst-initializers1.c | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 842a04f9f0..9ee7f8d47d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2007-01-18 Ulrich Drepper <drepper@redhat.com> + + * tst-initializers1.c: We want to test the initializers as seen + outside of libc, so undefined _LIBC. + + * pthread_join.c (cleanup): Avoid warning. + 2007-01-17 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c index c88d85b52f..6a87a8b329 100644 --- a/nptl/pthread_join.c +++ b/nptl/pthread_join.c @@ -30,8 +30,8 @@ cleanup (void *arg) /* If we already changed the waiter ID, reset it. The call cannot fail for any reason but the thread not having done that yet so there is no reason for a loop. */ - atomic_compare_and_exchange_bool_acq ((struct pthread **) arg, NULL, - THREAD_SELF); + (void) atomic_compare_and_exchange_bool_acq ((struct pthread **) arg, NULL, + THREAD_SELF); } diff --git a/nptl/tst-initializers1.c b/nptl/tst-initializers1.c index ccd27286e8..eacee35c61 100644 --- a/nptl/tst-initializers1.c +++ b/nptl/tst-initializers1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2005. @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +/* We test the code undef conditions outside of glibc. */ +#undef _LIBC + #include <pthread.h> pthread_mutex_t mtx_normal = PTHREAD_MUTEX_INITIALIZER; |