From: DJ Delorie <dj@redhat.com>
Date: Sat, 6 Sep 2003 23:51:12 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aae66b9f4349b557b30a2533e16fdb8529f8be3e;p=binutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8581dae61aa..e702593c606 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-06  Josef Zlomek  <zlomekj@suse.cz>
+
+	* fibheap.c (fibheap_replace_key_data): Change type of OKEY to
+	FIBHEAPKEY_T.
+
 2003-09-02  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR bootstrap/12100
diff --git a/libiberty/fibheap.c b/libiberty/fibheap.c
index 36062d451a2..bcecf80251f 100644
--- a/libiberty/fibheap.c
+++ b/libiberty/fibheap.c
@@ -218,7 +218,7 @@ fibheap_replace_key_data (heap, node, key, data)
      void *data;
 {
   void *odata;
-  int okey;
+  fibheapkey_t okey;
   fibnode_t y;
 
   /* If we wanted to, we could actually do a real increase by redeleting and