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'.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8715
This commit is contained in:
Julian Seward 2008-10-27 21:42:36 +00:00
parent fc2a1bf7dc
commit 1ee7f51214
3 changed files with 5 additions and 5 deletions

View File

@ -951,8 +951,8 @@ static Bool contained_within ( Addr outer, UWord n_outer,
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 )

View File

@ -4189,14 +4189,14 @@ register_Btype (struct work_stuff *work)
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. */

View File

@ -1555,7 +1555,7 @@ Word VTS__cmp_structural ( VTS* a, VTS* b );
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 */