File ltrace.trunk-r71.patch of Package ltrace

------------------------------------------------------------------------
r71 | pmachata-guest | 2006-11-30 13:47:40 +0000 (Thu, 30 Nov 2006) | 2 lines
Changed paths:
   M /ltrace/trunk/ChangeLog
   M /ltrace/trunk/elf.c

 * Interned elf_gnu_hash conflicts with version from libelf. Renaming to private_*.

------------------------------------------------------------------------
Index: elf.c
===================================================================
--- elf.c	(revision 70)
+++ elf.c	(revision 71)
@@ -324,7 +324,7 @@ add_library_symbol(GElf_Addr addr, const
 }
 
 /* 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 @@ static int in_load_libraries(const char 
 		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;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 70)
+++ ChangeLog	(revision 71)
@@ -1,5 +1,10 @@
 2006-11-30  Petr Machata  <pmachata@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@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