merge from gcc repository

diff --git a/include/ChangeLog b/include/ChangeLog
index b6ea9433f6f314a2f011f221ae117442740d9b27..c6ad3b42e624a1dbc47781ea46a9f9332bc4f2df 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-11  Mark Mitchell  <mark@codesourcery.com>
+
+       * splay-tree.h (splay_tree_predecessor): Declare.
+
 2000-09-29  Hans-Peter Nilsson  <hp@axis.com>
 
        * dis-asm.h: Declare cris_get_disassembler, not print_insn_cris.

diff --git a/include/splay-tree.h b/include/splay-tree.h
index 39882a4beac1d02d2e1aecfef02cf23c181f72eb..f53f855767b526bb6ec5d44c336ca9df62f4580d 100644 (file)
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -1,5 +1,5 @@
 /* A splay-tree datatype.  
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
 This file is part of GNU CC.
@@ -104,6 +104,12 @@ extern void splay_tree_remove              PARAMS((splay_tree,
 extern splay_tree_node splay_tree_lookup   
                                         PARAMS((splay_tree,
                                                splay_tree_key));
+extern splay_tree_node splay_tree_predecessor
+                                        PARAMS((splay_tree,
+                                               splay_tree_key));
+extern splay_tree_node splay_tree_successor
+                                        PARAMS((splay_tree,
+                                               splay_tree_key));
 extern int splay_tree_foreach           PARAMS((splay_tree,
                                                splay_tree_foreach_fn,
                                                void*));