svn commit: trunk/uClibc/ldso/ldso/avr32

[egtvedt at uclibc.org]

Author: egtvedt
Date: 2008-11-03 07:54:24 -0800 (Mon, 03 Nov 2008)
New Revision: 23917

Log:
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 <hans-christian.egtvedt at atmel.com>



Modified:
   trunk/uClibc/ldso/ldso/avr32/dl-sysdep.h


Changeset:
Modified: trunk/uClibc/ldso/ldso/avr32/dl-sysdep.h
===================================================================
--- trunk/uClibc/ldso/ldso/avr32/dl-sysdep.h	2008-11-03 15:52:38 UTC (rev 23916)
+++ trunk/uClibc/ldso/ldso/avr32/dl-sysdep.h	2008-11-03 15:54:24 UTC (rev 23917)
@@ -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))