From aae66b9f4349b557b30a2533e16fdb8529f8be3e Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sat, 6 Sep 2003 23:51:12 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/fibheap.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 8581dae..e702593 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2003-09-06 Josef Zlomek + + * fibheap.c (fibheap_replace_key_data): Change type of OKEY to + FIBHEAPKEY_T. + 2003-09-02 John David Anglin PR bootstrap/12100 diff --git a/libiberty/fibheap.c b/libiberty/fibheap.c index 36062d4..bcecf80 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 -- 2.7.4