diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index e46c71128e8..0f0cba3eb2e 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-15  Andrew Cagney  <ac131313@redhat.com>
+
+	From mainline: 2002-03-06  Jim Blandy  <jimb@redhat.com>
+	* splay-tree.c (splay_tree_xmalloc_allocate,
+	splay_tree_xmalloc_deallocate): Use K&R-style definitions, not
+	prototyped definitions.  Mark `data' arguments as unused.
+
 2002-02-21  Jim Blandy  <jimb@redhat.com>
 
 	* splay-tree.c (splay_tree_xmalloc_allocate,
diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index f12b4cc5007..7999447bc11 100644
--- a/libiberty/splay-tree.c
+++ b/libiberty/splay-tree.c
@@ -230,13 +230,17 @@ splay_tree_foreach_helper (sp, node, fn, data)
 
 /* An allocator and deallocator based on xmalloc.  */
 static void *
-splay_tree_xmalloc_allocate (int size, void *data)
+splay_tree_xmalloc_allocate (size, data)
+     int size;
+     void *data ATTRIBUTE_UNUSED;
 {
   return xmalloc (size);
 }
 
 static void
-splay_tree_xmalloc_deallocate (void *object, void *data)
+splay_tree_xmalloc_deallocate (object, data)
+     void *object;
+     void *data ATTRIBUTE_UNUSED;
 {
   free (object);
 }