diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-12-09 16:53:57 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-12-09 16:53:57 -0800 |
commit | 8ebd4b8855981462a03f5930a1f8d712c021190f (patch) | |
tree | 5dc072f6ecb41940b6f6c7bac2d690c9dd6a8030 /libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | |
parent | 641e7e36ad0a9b2899b04f256c5b243ada7da279 (diff) |
nptl: fix old style function declerations
also fix a few shadowed local warnings
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h')
-rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 6 |
1 files changed, 3 insertions, 3 deletions
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) \ |