From 8ebd4b8855981462a03f5930a1f8d712c021190f Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Wed, 9 Dec 2009 16:53:57 -0800 Subject: nptl: fix old style function declerations also fix a few shadowed local warnings Signed-off-by: Austin Foxley --- libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/i386') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 1a060c0f4..1033ebc2d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -173,7 +173,7 @@ extern int __lll_mutex_unlock_wake (int *__futex) #define lll_mutex_timedlock(futex, timeout) \ - ({ int result, ignore1, ignore2; \ + ({ int _result, ignore1, ignore2; \ __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %3\n\t" \ "jnz _L_mutex_timedlock_%=\n\t" \ ".subsection 1\n\t" \ @@ -186,11 +186,11 @@ extern int __lll_mutex_unlock_wake (int *__futex) ".size _L_mutex_timedlock_%=,.-_L_mutex_timedlock_%=\n"\ ".previous\n" \ "1:" \ - : "=a" (result), "=c" (ignore1), "=&d" (ignore2), \ + : "=a" (_result), "=c" (ignore1), "=&d" (ignore2), \ "=m" (futex) \ : "0" (0), "1" (1), "m" (futex), "m" (timeout) \ : "memory"); \ - result; }) + _result; }) #define lll_mutex_unlock(futex) \ -- cgit v1.2.3