From 42fb51e0d4e7ab9fe8ff2be3a7405acb8d44e9b2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Jul 2010 12:19:56 -0700 Subject: arm: Silence warning about shadow declarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libc/inet/socketcalls.c: In function ‘__libc_recvfrom’: libc/inet/socketcalls.c:229:1: warning: declaration of ‘_sys_result’ shadows a previous local libc/inet/socketcalls.c:229:1: warning: shadowed declaration is here Signed-off-by: Khem Raj --- libc/sysdeps/linux/arm/bits/syscalls.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libc/sysdeps/linux/arm/bits') diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h index 4aab048cf..4b587e4f5 100644 --- a/libc/sysdeps/linux/arm/bits/syscalls.h +++ b/libc/sysdeps/linux/arm/bits/syscalls.h @@ -42,7 +42,7 @@ #if !defined(__thumb__) #if defined(__ARM_EABI__) #define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ - ({unsigned int __sys_result; \ + ({unsigned int __internal_sys_result; \ { \ register int _a1 __asm__ ("r0"), _nr __asm__ ("r7"); \ LOAD_ARGS_##nr (args) \ @@ -51,13 +51,13 @@ : "=r" (_a1) \ : "r" (_nr) ASM_ARGS_##nr \ : "memory"); \ - __sys_result = _a1; \ + __internal_sys_result = _a1; \ } \ - (int) __sys_result; }) + (int) __internal_sys_result; }) #else /* defined(__ARM_EABI__) */ #define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ - ({ unsigned int __sys_result; \ + ({ unsigned int __internal_sys_result; \ { \ register int _a1 __asm__ ("a1"); \ LOAD_ARGS_##nr (args) \ @@ -65,16 +65,16 @@ : "=r" (_a1) \ : "i" (name) ASM_ARGS_##nr \ : "memory"); \ - __sys_result = _a1; \ + __internal_sys_result = _a1; \ } \ - (int) __sys_result; }) + (int) __internal_sys_result; }) #endif #else /* !defined(__thumb__) */ /* We can't use push/pop inside the asm because that breaks unwinding (ie. thread cancellation). */ #define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ - ({ unsigned int __sys_result; \ + ({ unsigned int __internal_sys_result; \ { \ int _sys_buf[2]; \ register int _a1 __asm__ ("a1"); \ @@ -88,9 +88,9 @@ : "=r" (_a1) \ : "r" (_v3) ASM_ARGS_##nr \ : "memory"); \ - __sys_result = _a1; \ + __internal_sys_result = _a1; \ } \ - (int) __sys_result; }) + (int) __internal_sys_result; }) #endif /*!defined(__thumb__)*/ #define INTERNAL_SYSCALL_ERROR_P(val, err) \ -- cgit v1.2.3