From 68dc4dcbddb050072f959118b6793dfadf395a06 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 24 Mar 2004 23:53:39 +0000 Subject: Update. 2004-03-24 Ulrich Drepper * stdio-common/vfscanf.c [!COMPILE_WSCANF] (TOLOWER): Cast first parameter to unsigned char. * sysdeps/generic/strcasestr.c [_LIBC] (TOLOWER): Likewise. --- nptl/ChangeLog | 3 +++ nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b0bce881cd..4b8e43d6e5 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2004-03-24 Ulrich Drepper + * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h + (lll_mutex_cond_trylock): Define as wrapper around __lll_cond_trylock. + * sysdeps/unix/sysv/linux/getpid.c (really_getpid): Reorganize code to avoid warning. diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h index e9f895d6e8..e107ef5975 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h @@ -101,7 +101,7 @@ #define lll_mutex_trylock(lock) __lll_trylock (&(lock)) /* Set *futex to 2 if it is 0, atomically. Returns the old value */ -#define lll_mutex_cond_trylock(futex) \ +#define __lll_cond_trylock(futex) \ ({ int __val; \ __asm __volatile ("1: lwarx %0,0,%2\n" \ " cmpwi 0,%0,0\n" \ @@ -114,6 +114,7 @@ : "cr0", "memory"); \ __val; \ }) +#define lll_mutex_cond_trylock(lock) __lll_cond_trylock (&(lock)) extern void __lll_lock_wait (int *futex) attribute_hidden; -- cgit 1.4.1