Alexandre Julliard : loader: Rename the elf_hash function to avoid conflicts.
Alexandre Julliard
julliard at winehq.org
Wed Feb 13 13:54:29 CST 2013
Module: wine
Branch: master
Commit: 097867debd1f7f1229d8393754353a9b992574d3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=097867debd1f7f1229d8393754353a9b992574d3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 13 16:58:23 2013 +0100
loader: Rename the elf_hash function to avoid conflicts.
---
loader/preloader.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/loader/preloader.c b/loader/preloader.c
index 92fae74..e2f9c3f 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -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;
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 */
{
- const unsigned int hash = elf_hash(var);
+ const unsigned int hash = wld_elf_hash(var);
const Elf_Symndx nbuckets = hashtab[0];
const Elf_Symndx *buckets = hashtab + 2;
const Elf_Symndx *chains = buckets + nbuckets;
More information about the wine-cvs
mailing list