diff options
author | DJ Delorie <dj@redhat.com> | 2003-09-06 23:51:12 +0000 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2003-09-06 23:51:12 +0000 |
commit | aae66b9f4349b557b30a2533e16fdb8529f8be3e (patch) | |
tree | 67474a77994020d666447a7d94badc5508b96a6e /libiberty | |
parent | 2a0e29b40650446904e3f4728cb5fe3f55f46c5d (diff) | |
download | gdb-aae66b9f4349b557b30a2533e16fdb8529f8be3e.zip gdb-aae66b9f4349b557b30a2533e16fdb8529f8be3e.tar.gz gdb-aae66b9f4349b557b30a2533e16fdb8529f8be3e.tar.bz2 |
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r-- | libiberty/ChangeLog | 5 | ||||
-rw-r--r-- | libiberty/fibheap.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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 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 |