[git commit master 1/1] nptl_sh: Fix compiler warning due to shadowed variable

Carmelo Amoroso carmelo.amoroso at st.com
Thu Sep 16 12:52:11 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=f3149e573862ffa69297abd2934b48617415c97d
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 libc/sysdeps/linux/sh/bits/atomic.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libc/sysdeps/linux/sh/bits/atomic.h b/libc/sysdeps/linux/sh/bits/atomic.h
index bc79b29..fa6d0de 100644
--- a/libc/sysdeps/linux/sh/bits/atomic.h
+++ b/libc/sysdeps/linux/sh/bits/atomic.h
@@ -79,7 +79,7 @@ typedef uintmax_t uatomic_max_t;
 */
 
 #define __arch_compare_and_exchange_n(mem, newval, oldval, bwl, version) \
-  ({ signed long __result; \
+  ({ signed long __arch_result; \
      __asm__ __volatile__ ("\
 	.align 2\n\
 	mova 1f,r0\n\
@@ -94,10 +94,10 @@ typedef uintmax_t uatomic_max_t;
      .ifeqs \"bool\",\"" #version "\"\n\
         movt %0\n\
      .endif\n"					\
-	: "=&r" (__result)			\
+	: "=&r" (__arch_result)			\
 	: "r" (mem), "r" (newval), "r" (oldval)	\
 	: "r0", "r1", "t", "memory");		\
-     __result; })
+     __arch_result; })
 
 #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
   __arch_compare_and_exchange_n(mem, newval, (int8_t)(oldval), b, val)
-- 
1.7.1



More information about the uClibc-cvs mailing list