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/x86_64 | |
| 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/x86_64')
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index 694cbf448..35cd868d0 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -143,7 +143,7 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden; #define lll_mutex_timedlock(futex, timeout) \ - ({ int result, ignore1, ignore2, ignore3; \ + ({ int _result, ignore1, ignore2, ignore3; \ __asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n" \ @@ -155,11 +155,11 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden; "jmp 2f\n\t" \ ".previous\n" \ "2:" \ - : "=a" (result), "=&D" (ignore1), "=S" (ignore2), \ + : "=a" (_result), "=&D" (ignore1), "=S" (ignore2), \ "=&d" (ignore3), "=m" (futex) \ : "0" (0), "2" (1), "m" (futex), "m" (timeout) \ : "memory", "cx", "cc", "r10", "r11"); \ - result; }) + _result; }) #define lll_mutex_unlock(futex) \ |