[Ltrace-devel] r71 - ltrace/trunk

[Petr Machata]

Author: pmachata-guest
Date: 2006-11-30 14:47:40 +0100 (Thu, 30 Nov 2006)
New Revision: 71

Modified:
   ltrace/trunk/ChangeLog
   ltrace/trunk/elf.c
Log:
 * Interned elf_gnu_hash conflicts with version from libelf. Renaming to private_*.


Modified: ltrace/trunk/ChangeLog
===================================================================
--- ltrace/trunk/ChangeLog	2006-11-30 13:45:07 UTC (rev 70)
+++ ltrace/trunk/ChangeLog	2006-11-30 13:47:40 UTC (rev 71)
@@ -1,5 +1,10 @@
 2006-11-30  Petr Machata  <pmachata at redhat.com>
 
+	* elf.c (elf_gnu_hash): renamed to private_elf_gnu_hash to avoid
+	conflicts with non-static version from libelf.
+
+2006-11-30  Petr Machata  <pmachata at redhat.com>
+
 	* elf.c (in_load_libraries): removed unused variables
 	bitmask_idxbits and shift.
 	* elf.c (do_init_elf, opd2addr): use ARCH_SUPPORTS_OPD to

Modified: ltrace/trunk/elf.c
===================================================================
--- ltrace/trunk/elf.c	2006-11-30 13:45:07 UTC (rev 70)
+++ ltrace/trunk/elf.c	2006-11-30 13:47:40 UTC (rev 71)
@@ -324,7 +324,7 @@
 }
 
 /* stolen from elfutils-0.123 */
-static unsigned long elf_gnu_hash(const char *name)
+static unsigned long private_elf_gnu_hash(const char *name)
 {
 	unsigned long h = 5381;
 	const unsigned char *string = (const unsigned char *)name;
@@ -344,7 +344,7 @@
 		return 1;
 
 	hash = elf_hash((const unsigned char *)name);
-	gnu_hash = elf_gnu_hash(name);
+	gnu_hash = private_elf_gnu_hash(name);
 	for (i = 1; i <= library_num; ++i) {
 		if (lte[i].hash == NULL)
 			continue;