merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 883088ea6dff13cb16cfd0a91ef6e6a341aa132a..e2b5e891858151ecbbf9ac6074a5a63a489add2a 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-13  Jeff Law  <law@redhat.com>
+
+       * hashtab.h (htab_remove_elt_with_hash): Prototype new function.
+
 2004-03-30  Zack Weinberg  <zack@codesourcery.com>
 
        * hashtab.h, splay-tree.h: Use new shorter form of GTY markers.

diff --git a/include/hashtab.h b/include/hashtab.h
index 1af7368d338bd44cdc462b7ecdb31784c8e70b6b..a2ef32c36ae20de469d2d834924171a6ed026705 100644 (file)
--- a/include/hashtab.h
+++ b/include/hashtab.h
@@ -166,6 +166,7 @@ extern PTR     *htab_find_slot_with_hash  PARAMS ((htab_t, const void *,
                                                   enum insert_option));
 extern void    htab_clear_slot PARAMS ((htab_t, void **));
 extern void    htab_remove_elt PARAMS ((htab_t, void *));
+extern void    htab_remove_elt_with_hash PARAMS ((htab_t, void *, hashval_t));
 
 extern void    htab_traverse   PARAMS ((htab_t, htab_trav, void *));
 extern void    htab_traverse_noresize  PARAMS ((htab_t, htab_trav, void *));