X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fmerge.c;h=49074ece028a0d280c99387a17e59e5a94a67244;hb=563e308f244b1d6adb9d012a3e11d458400b3ff2;hp=3d0904153eb85c88d72bffa78529ec62916d948d;hpb=8550eb6e64bdd0582528498c5cad6f80014b7deb;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/merge.c b/bfd/merge.c
index 3d0904153e..49074ece02 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -108,6 +108,12 @@ static struct sec_merge_hash_entry *sec_merge_add
 	   struct sec_merge_sec_info *));
 static boolean sec_merge_emit
   PARAMS ((bfd *, struct sec_merge_hash_entry *));
+static int cmplengthentry PARAMS ((const PTR, const PTR));
+static int last4_eq PARAMS ((const PTR, const PTR));
+static int last_eq PARAMS ((const PTR, const PTR));
+static boolean record_section
+  PARAMS ((struct sec_merge_info *, struct sec_merge_sec_info *));
+static void merge_strings PARAMS ((struct sec_merge_info *));
 
 /* Routine to create an entry in a section merge hashtab.  */
 
@@ -475,7 +481,8 @@ cmplengthentry (a, b)
 
 static int
 last4_eq (a, b)
-     const void *a, *b;
+     const PTR a;
+     const PTR b;
 {
   struct sec_merge_hash_entry * A = (struct sec_merge_hash_entry *) a;
   struct sec_merge_hash_entry * B = (struct sec_merge_hash_entry *) b;
@@ -502,7 +509,8 @@ last4_eq (a, b)
 
 static int
 last_eq (a, b)
-     const void *a, *b;
+     const PTR a;
+     const PTR b;
 {
   struct sec_merge_hash_entry * A = (struct sec_merge_hash_entry *) a;
   struct sec_merge_hash_entry * B = (struct sec_merge_hash_entry *) b;