summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2003-09-06 23:51:12 +0000
committerDJ Delorie <dj@delorie.com>2003-09-06 23:51:12 +0000
commit341d63f3f75e4a962e6b0ce1e9e4d9ec048bde89 (patch)
treef94eed0fb734dedb6e3797cd6172eeaf1a557c4d
parent1c94352f276f7512ff16523e7bf125a5d03ca158 (diff)
downloadbinutils-redhat-341d63f3f75e4a962e6b0ce1e9e4d9ec048bde89.tar.gz
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/fibheap.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8581dae61a..e702593c60 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 36062d451a..bcecf80251 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