* cfglayout.c (choose_inner_scope): Make it static.

	* rtl.h: Remove the corresponding prototype.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90502 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5658d03..5c51ed3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -7,6 +7,9 @@
        record_alias_subset.
        * rtl.h: Remove the prototype for addr_side_effect_eval.
 
+       * cfglayout.c (choose_inner_scope): Make it static.
+       * rtl.h: Remove the corresponding prototype.
+
 2004-11-11  Kazu Hirata  <kazu@cs.umass.edu>
 
        * function.c (expand_function_end): Remove an "if" statement

diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c
index 2d88a37..4ca4c1b 100644 (file)
--- a/gcc/cfglayout.c
+++ b/gcc/cfglayout.c
@@ -347,7 +347,7 @@ set_block_levels (tree block, int level)
 }
 \f
 /* Return sope resulting from combination of S1 and S2.  */
-tree
+static tree
 choose_inner_scope (tree s1, tree s2)
 {
    if (!s1)

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 30ea52e..f8ca1c3 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1507,7 +1507,6 @@ extern rtx next_cc0_user (rtx);
 extern rtx prev_cc0_setter (rtx);
 
 /* In cfglayout.c  */
-extern tree choose_inner_scope (tree, tree);
 extern int insn_line (rtx);
 extern const char * insn_file (rtx);
 extern int locator_line (int);