diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-09-25 15:44:20 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-09-25 15:44:20 +0000 |
| commit | 5ed9cc7c21189bab600d08763133a2b8fe90896d (patch) | |
| tree | f8965f20db2401865e69451279de722a186e01ee /nptl | |
| parent | 0e4d91bd31869b6f67e9284e1de3d470e10a3156 (diff) | |
Updated to fedora-glibc-20060925T1535cvs/fedora-glibc-2_4_90-35
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/descr.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0d05e200ff..8024bd302c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2006-09-24 Ulrich Drepper <drepper@redhat.com> + + [BZ #3251] + * descr.h (ENQUEUE_MUTEX_BOTH): Add cast to avoid warning. + Patch by Petr Baudis. + 2006-09-18 Jakub Jelinek <jakub@redhat.com> * tst-kill4.c (do_test): Explicitly set tf thread's stack size. diff --git a/nptl/descr.h b/nptl/descr.h index b9b9ed7b98..321ce85085 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -201,7 +201,7 @@ struct pthread mutex->__data.__list.__next \ = THREAD_GETMEM (THREAD_SELF, robust_list.__next); \ THREAD_SETMEM (THREAD_SELF, robust_list.__next, \ - ((uintptr_t) &mutex->__data.__list) | val); \ + (void *) (((uintptr_t) &mutex->__data.__list) | val)); \ } while (0) # define DEQUEUE_MUTEX(mutex) \ do { \ |