|
From: <sv...@va...> - 2008-10-27 22:42:37
|
Author: sewardj
Date: 2008-10-27 21:42:36 +0000 (Mon, 27 Oct 2008)
New Revision: 8715
Log:
Rename some local variables called 'index' to something else, to stop
gcc-3.2.2 complaining they shadow some built-in global declaration of
'index'.
Modified:
trunk/coregrind/m_debuginfo/readelf.c
trunk/coregrind/m_demangle/cplus-dem.c
trunk/helgrind/libhb_core.c
Modified: trunk/coregrind/m_debuginfo/readelf.c
===================================================================
--- trunk/coregrind/m_debuginfo/readelf.c 2008-10-27 09:54:14 UTC (rev 8714)
+++ trunk/coregrind/m_debuginfo/readelf.c 2008-10-27 21:42:36 UTC (rev 8715)
@@ -951,8 +951,8 @@
return False;
}
-static void* INDEX_BIS ( void* base, Word index, Word scale ) {
- return (void*)( ((UChar*)base) + index * scale );
+static void* INDEX_BIS ( void* base, Word idx, Word scale ) {
+ return (void*)( ((UChar*)base) + idx * scale );
}
static Addr round_Addr_upwards ( Addr a, UInt align )
Modified: trunk/coregrind/m_demangle/cplus-dem.c
===================================================================
--- trunk/coregrind/m_demangle/cplus-dem.c 2008-10-27 09:54:14 UTC (rev 8714)
+++ trunk/coregrind/m_demangle/cplus-dem.c 2008-10-27 21:42:36 UTC (rev 8715)
@@ -4189,14 +4189,14 @@
static void
remember_Btype (struct work_stuff *work, const char *start,
- int len, int index)
+ int len, int indx)
{
char *tem;
tem = XNEWVEC (char, len + 1);
memcpy (tem, start, len);
tem[len] = '\0';
- work -> btypevec[index] = tem;
+ work -> btypevec[indx] = tem;
}
/* Lose all the info related to B and K type codes. */
Modified: trunk/helgrind/libhb_core.c
===================================================================
--- trunk/helgrind/libhb_core.c 2008-10-27 09:54:14 UTC (rev 8714)
+++ trunk/helgrind/libhb_core.c 2008-10-27 21:42:36 UTC (rev 8715)
@@ -1555,7 +1555,7 @@
void VTS__show ( HChar* buf, Int nBuf, VTS* vts );
/* Debugging only. Return vts[index], so to speak. */
-ULong VTS__indexAt_SLOW ( VTS* vts, Thr* index );
+ULong VTS__indexAt_SLOW ( VTS* vts, Thr* idx );
#endif /* ! __HB_VTS_H */
|