From bd647c2959369c47baaa9b83a895ed7b0f675384 Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Mon, 3 Nov 2008 15:54:24 +0000 Subject: Prefix variables defined in INIT_GOT define for AVR32 arch This patch will prefix the i and nr_got variable with an underscore to seperate them from any variables already present in the functions where the macro is used. Needed to silence compiler warnings. Signed-off-by: Hans-Christian Egtvedt --- ldso/ldso/avr32/dl-sysdep.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/avr32/dl-sysdep.h b/ldso/ldso/avr32/dl-sysdep.h index 0d20e9e3e..6696382b3 100644 --- a/ldso/ldso/avr32/dl-sysdep.h +++ b/ldso/ldso/avr32/dl-sysdep.h @@ -24,15 +24,15 @@ /* Initialization sequence for the application/library GOT. */ #define INIT_GOT(GOT_BASE,MODULE) \ do { \ - unsigned long i, nr_got; \ + unsigned long _i, _nr_got; \ \ GOT_BASE[0] = (unsigned long) _dl_linux_resolve; \ GOT_BASE[1] = (unsigned long) MODULE; \ \ /* Add load address displacement to all GOT entries */ \ - nr_got = MODULE->dynamic_info[DT_AVR32_GOTSZ_IDX] / 4; \ - for (i = 2; i < nr_got; i++) \ - GOT_BASE[i] += (unsigned long)MODULE->loadaddr; \ + _nr_got = MODULE->dynamic_info[DT_AVR32_GOTSZ_IDX] / 4; \ + for (_i = 2; _i < _nr_got; _i++) \ + GOT_BASE[_i] += (unsigned long)MODULE->loadaddr; \ } while (0) #define do_rem(result, n, base) ((result) = (n) % (base)) -- cgit v1.2.3