loader: Rename the elf_hash function to avoid conflicts.

This commit is contained in:
Alexandre Julliard 2013-02-13 16:58:23 +01:00
parent 3b8ab28c40
commit 097867debd

View File

@ -912,7 +912,7 @@ static void map_so_lib( const char *name, struct wld_link_map *l)
} }
static unsigned int elf_hash( const char *name ) static unsigned int wld_elf_hash( const char *name )
{ {
unsigned int hi, hash = 0; unsigned int hi, hash = 0;
while (*name) while (*name)
@ -1006,7 +1006,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
} }
else if (hashtab) /* old style hash table */ else if (hashtab) /* old style hash table */
{ {
const unsigned int hash = elf_hash(var); const unsigned int hash = wld_elf_hash(var);
const Elf_Symndx nbuckets = hashtab[0]; const Elf_Symndx nbuckets = hashtab[0];
const Elf_Symndx *buckets = hashtab + 2; const Elf_Symndx *buckets = hashtab + 2;
const Elf_Symndx *chains = buckets + nbuckets; const Elf_Symndx *chains = buckets + nbuckets;