diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 2 | ||||
| -rw-r--r-- | nptl/tst-rwlock14.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index eda7e80613..7ad935c96d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,7 @@ 2007-07-30 Jakub Jelinek <jakub@redhat.com> + * tst-rwlock14.c (do_test): Avoid warnings on 32-bit arches. + * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S (pthread_rwlock_timedrdlock): Copy futex retval to %esi rather than %ecx. diff --git a/nptl/tst-rwlock14.c b/nptl/tst-rwlock14.c index fc0d3d219f..00e1becbfa 100644 --- a/nptl/tst-rwlock14.c +++ b/nptl/tst-rwlock14.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. @@ -130,8 +130,8 @@ do_test (void) result = 1; } - ts.tv_nsec = 0x100001000LL; - if (ts.tv_nsec != 0x100001000LL) + ts.tv_nsec = (__typeof (ts.tv_nsec)) 0x100001000LL; + if ((__typeof (ts.tv_nsec)) 0x100001000LL != 0x100001000LL) ts.tv_nsec = 2000000000; e = pthread_rwlock_timedrdlock (&r, &ts); |