merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8581dae61aaff5d48ad27eb46ac9cdcc879eedeb..e702593c60667be9402ae28ce3ad56d15fc5336b 100644 (file)
--- 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 36062d451a23ab1b6e60b8ccf10f5e7e38a131d6..bcecf80251f225a0f8aeb1092b3ccfeba10aedff 100644 (file)
--- 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