* cp-tree.h (do_poplevel): Remove prototype.

	* semantics.c (do_poplevel): Add prototype.  Make static.

	* cp-tree.h (original_type): Remove prototype.
	* typeck.c (original_type): Make static.

	* cp-tree.h (declare_global_var): Remove prototype.
	* decl.c (declare_global_var): Make static.

	* cp-tree.h (implicitly_declare_fn): Remove prototype.
	* method.c (implicitly_declare_fn): Make static.

	* cp-tree.h (fold_decl_constant_value): Remove prototype.
	* pt.c (fold_decl_constant_value): Make static.


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

7 files changed, 21 insertions, 11 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 018a25dbc9e..ee481d7c1c9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,20 @@
 2006-01-23  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	* cp-tree.h (do_poplevel): Remove prototype.
+	* semantics.c (do_poplevel): Add prototype.  Make static.
+
+	* cp-tree.h (original_type): Remove prototype.
+	* typeck.c (original_type): Make static.
+
+	* cp-tree.h (declare_global_var): Remove prototype.
+	* decl.c (declare_global_var): Make static.
+
+	* cp-tree.h (implicitly_declare_fn): Remove prototype.
+	* method.c (implicitly_declare_fn): Make static.
+
+	* cp-tree.h (fold_decl_constant_value): Remove prototype.
+	* pt.c (fold_decl_constant_value): Make static.
+
 	* cp-tree.h (build_x_delete): Remove prototype.
 	* init.c (build_vec_delete_1): Call build_op_delete_call directly
 	and not via build_x_delete.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 0c777d790c4..68c6ddb65e7 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3848,7 +3848,6 @@ extern tree force_target_expr			(tree, tree);
 extern tree build_target_expr_with_type		(tree, tree);
 extern int local_variable_p			(tree);
 extern int nonstatic_local_decl_p		(tree);
-extern tree declare_global_var			(tree, tree);
 extern tree register_dtor_fn			(tree);
 extern tmpl_spec_kind current_tmpl_spec_kind	(int);
 extern tree cp_fname_init			(const char *, tree *);
@@ -3983,8 +3982,6 @@ extern tree make_thunk				(tree, bool, tree, tree);
 extern void finish_thunk			(tree);
 extern void use_thunk				(tree, bool);
 extern void synthesize_method			(tree);
-extern tree implicitly_declare_fn		(special_function_kind,
-						 tree, bool);
 extern tree lazily_declare_fn			(special_function_kind,
 						 tree);
 extern tree skip_artificial_parms_for		(tree, tree);
@@ -4063,7 +4060,6 @@ extern tree build_non_dependent_expr		(tree);
 extern tree build_non_dependent_args		(tree);
 extern bool reregister_specialization		(tree, tree, tree);
 extern tree fold_non_dependent_expr		(tree);
-extern tree fold_decl_constant_value		(tree);
 
 /* in repo.c */
 extern void init_repo				(void);
@@ -4134,7 +4130,6 @@ extern void perform_deferred_access_checks	(void);
 extern void perform_or_defer_access_check	(tree, tree);
 extern int stmts_are_full_exprs_p		(void);
 extern void init_cp_semantics			(void);
-extern tree do_poplevel				(tree);
 extern void add_decl_expr			(tree);
 extern tree finish_expr_stmt			(tree);
 extern tree begin_if_stmt			(void);
@@ -4304,7 +4299,6 @@ extern tree require_complete_type		(tree);
 extern tree complete_type			(tree);
 extern tree complete_type_or_else		(tree, tree);
 extern int type_unknown_p			(tree);
-extern tree original_type			(tree);
 extern bool comp_except_specs			(tree, tree, bool);
 extern bool comptypes				(tree, tree, int);
 extern bool compparms				(tree, tree);
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 3c98d4918f2..e4be9e0f88c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5138,7 +5138,7 @@ finish_decl (tree decl, tree init, tree asmspec_tree)
    had been seen.  Used to create compiler-generated global
    variables.  */
 
-tree
+static tree
 declare_global_var (tree name, tree type)
 {
   tree decl;
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 250c66d08b3..4a1a4ed2dac 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -969,7 +969,7 @@ locate_copy (tree type, void *client_)
    reference argument or a non-const reference.  Returns the
    FUNCTION_DECL for the implicitly declared function.  */
 
-tree
+static tree
 implicitly_declare_fn (special_function_kind kind, tree type, bool const_p)
 {
   tree fn;
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 236145763ad..40ebbe5cca7 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3357,7 +3357,7 @@ fold_non_dependent_expr (tree expr)
    initializers can maintain a syntactic rather than semantic form
    (even if they are non-dependent, for access-checking purposes).  */
 
-tree
+static tree
 fold_decl_constant_value (tree expr)
 {
   tree const_expr = expr;
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 6121d43b99f..47ff6ea0fed 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -57,6 +57,7 @@
    parsing into this file; that will make implementing the new parser
    much easier since it will be able to make use of these routines.  */
 
+static tree do_poplevel (tree);
 static tree maybe_convert_cond (tree);
 static tree simplify_aggr_init_exprs_r (tree *, int *, void *);
 static void emit_associated_thunks (tree);
@@ -427,7 +428,7 @@ anon_aggr_type_p (tree node)
 
 /* Finish a scope.  */
 
-tree
+static tree
 do_poplevel (tree stmt_list)
 {
   tree block = NULL;
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 01f2ebbd9b5..49deccc0ad3 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -224,7 +224,7 @@ commonparms (tree p1, tree p2)
 
 /* Given a type, perhaps copied for a typedef,
    find the "original" version of it.  */
-tree
+static tree
 original_type (tree t)
 {
   while (TYPE_NAME (t) != NULL_TREE)