cfns.gperf: ANSIfy function declarations.

	* cfns.gperf: ANSIfy function declarations.
	* cfns.h: Regenerate.
	* cp-tree.h: ANSIfy function declarations.

From-SVN: r61167

4 files changed, 650 insertions, 632 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6ea43a4..382e26a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-10  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* cfns.gperf: ANSIfy function declarations.
+	* cfns.h: Regenerate.
+	* cp-tree.h: ANSIfy function declarations.
+
 2003-01-10  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (reparse_absdcl_as_expr): Remove.
@@ -36,6 +42,11 @@
 
 2003-01-09  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+        * cfns.gperf: ANSIfy function declarations.
+        * cfns.h: Regenerate.
+        * cp-tree.h: ANSIfy function declarations.
+        * parser.c: ANSIfy function declarations & definitions.
+
 	* decl.c (bad_specifiers): Fix parameter order error I introduced.
 
 2003-01-09  Geoffrey Keating  <geoffk@apple.com>
diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
index 0d1e71b..850b66a 100644
--- a/gcc/cp/cfns.gperf
+++ b/gcc/cp/cfns.gperf
@@ -2,11 +2,11 @@
 #ifdef __GNUC__
 __inline
 #endif
-static unsigned int hash PARAMS ((const char *, unsigned int));
+static unsigned int hash (const char *, unsigned int);
 #ifdef __GNUC__
 __inline
 #endif
-const char * libc_name_p PARAMS ((const char *, unsigned int));
+const char * libc_name_p (const char *, unsigned int);
 %}
 # The standard C library functions, for feeding to gperf; the result is used
 # by nothrow_libfn_p.
diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
index c7e6a9d..e420094 100644
--- a/gcc/cp/cfns.h
+++ b/gcc/cp/cfns.h
@@ -1,17 +1,21 @@
-/* C code produced by gperf version 2.7 */
-/* Command-line: gperf -o -C -E -k 1-6,$ -j1 -D -N libc_name_p ../../../egcs-CVS20000404/gcc/cp/cfns.gperf  */
+/* C code produced by gperf version 2.7.2 */
+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p ../../gcc/gcc/cp/cfns.gperf  */
 #ifdef __GNUC__
 __inline
 #endif
-static unsigned int hash PARAMS ((const char *, unsigned int));
+static unsigned int hash (const char *, unsigned int);
 #ifdef __GNUC__
 __inline
 #endif
-const char * libc_name_p PARAMS ((const char *, unsigned int));
+const char * libc_name_p (const char *, unsigned int);
 /* maximum key range = 1020, duplicates = 1 */
 
 #ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
 hash (str, len)
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 46fd5b1..a9d4f2b 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1,6 +1,6 @@
 /* Definitions for C++ parsing and type checking.
-   Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2003,
-   2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@cygnus.com)
 
 This file is part of GCC.
@@ -3553,7 +3553,7 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG };
 
 /* in lex.c  */
 
-extern void init_reswords PARAMS ((void));
+extern void init_reswords (void);
 
 /* Indexed by TREE_CODE, these tables give C-looking names to
    operators represented by TREE_CODES.  For example,
@@ -3581,11 +3581,11 @@ extern GTY(()) operator_name_info_t assignment_operator_name_info
 
 /* in call.c */
 extern bool check_dtor_name (tree, tree);
-extern int get_arglist_len_in_bytes		PARAMS ((tree));
+extern int get_arglist_len_in_bytes		(tree);
 
-extern tree build_vfield_ref			PARAMS ((tree, tree));
+extern tree build_vfield_ref			(tree, tree);
 extern tree build_scoped_method_call (tree, tree, tree, tree);
-extern tree build_conditional_expr		PARAMS ((tree, tree, tree));
+extern tree build_conditional_expr		(tree, tree, tree);
 extern tree build_addr_func (tree);
 extern tree build_call (tree, tree);
 extern tree build_method_call (tree, tree, tree, tree, int);
@@ -3609,7 +3609,7 @@ extern tree build_x_va_arg (tree, tree);
 extern tree cxx_type_promotes_to (tree);
 extern tree type_passed_as (tree);
 extern tree convert_for_arg_passing (tree, tree);
-extern tree cp_convert_parm_for_inlining        PARAMS ((tree, tree, tree));
+extern tree cp_convert_parm_for_inlining        (tree, tree, tree);
 extern bool is_properly_derived_from (tree, tree);
 extern tree initialize_reference (tree, tree);
 extern tree strip_top_quals (tree);
@@ -3617,53 +3617,53 @@ extern tree perform_implicit_conversion (tree, tree);
 extern tree in_charge_arg_for_name (tree);
 
 /* in class.c */
-extern tree build_base_path			PARAMS ((enum tree_code, tree, tree, int));
-extern tree convert_to_base                     PARAMS ((tree, tree, bool));
-extern tree build_vtbl_ref			PARAMS ((tree, tree));
-extern tree build_vfn_ref			PARAMS ((tree, tree));
-extern tree get_vtable_decl                     PARAMS ((tree, int));
+extern tree build_base_path			(enum tree_code, tree, tree, int);
+extern tree convert_to_base                     (tree, tree, bool);
+extern tree build_vtbl_ref			(tree, tree);
+extern tree build_vfn_ref			(tree, tree);
+extern tree get_vtable_decl                     (tree, int);
 extern void resort_sorted_fields 
-  PARAMS ((void *, void *, gt_pointer_operator, void *));
+  (void *, void *, gt_pointer_operator, void *);
 extern void resort_type_method_vec
-  PARAMS ((void *, void *, gt_pointer_operator, void *));
-extern void add_method				PARAMS ((tree, tree, int));
-extern int currently_open_class			PARAMS ((tree));
-extern tree currently_open_derived_class	PARAMS ((tree));
-extern void duplicate_tag_error			PARAMS ((tree));
-extern tree finish_struct			PARAMS ((tree, tree));
-extern void finish_struct_1			PARAMS ((tree));
-extern int resolves_to_fixed_type_p		PARAMS ((tree, int *));
-extern void init_class_processing		PARAMS ((void));
-extern int is_empty_class			PARAMS ((tree));
-extern void pushclass				PARAMS ((tree, int));
-extern void popclass				PARAMS ((void));
-extern void push_nested_class			PARAMS ((tree, int));
-extern void pop_nested_class			PARAMS ((void));
-extern int current_lang_depth			PARAMS ((void));
-extern void push_lang_context			PARAMS ((tree));
-extern void pop_lang_context			PARAMS ((void));
-extern tree instantiate_type			PARAMS ((tree, tree, tsubst_flags_t));
-extern void print_class_statistics              PARAMS ((void));
-extern void cxx_print_statistics		PARAMS ((void));
+  (void *, void *, gt_pointer_operator, void *);
+extern void add_method				(tree, tree, int);
+extern int currently_open_class			(tree);
+extern tree currently_open_derived_class	(tree);
+extern void duplicate_tag_error			(tree);
+extern tree finish_struct			(tree, tree);
+extern void finish_struct_1			(tree);
+extern int resolves_to_fixed_type_p		(tree, int *);
+extern void init_class_processing		(void);
+extern int is_empty_class			(tree);
+extern void pushclass				(tree, int);
+extern void popclass				(void);
+extern void push_nested_class			(tree, int);
+extern void pop_nested_class			(void);
+extern int current_lang_depth			(void);
+extern void push_lang_context			(tree);
+extern void pop_lang_context			(void);
+extern tree instantiate_type			(tree, tree, tsubst_flags_t);
+extern void print_class_statistics              (void);
+extern void cxx_print_statistics		(void);
 extern void cxx_print_xnode (FILE *, tree, int);
 extern void cxx_print_decl (FILE *, tree, int);
 extern void cxx_print_type (FILE *, tree, int);
 extern void cxx_print_identifier (FILE *, tree, int);
-extern void cxx_print_error_function	PARAMS ((struct diagnostic_context *,
-						 const char *));
-extern void build_self_reference		PARAMS ((void));
-extern int same_signature_p			PARAMS ((tree, tree));
-extern void warn_hidden				PARAMS ((tree));
-extern void maybe_add_class_template_decl_list	PARAMS ((tree, tree, int));
-extern tree get_enclosing_class			PARAMS ((tree));
-int is_base_of_enclosing_class			PARAMS ((tree, tree));
-extern void unreverse_member_declarations       PARAMS ((tree));
-extern void invalidate_class_lookup_cache       PARAMS ((void));
-extern void maybe_note_name_used_in_class       PARAMS ((tree, tree));
-extern void note_name_declared_in_class         PARAMS ((tree, tree));
-extern tree get_vtbl_decl_for_binfo             PARAMS ((tree));
-extern tree get_vtt_name                        PARAMS ((tree));
-extern tree get_primary_binfo                   PARAMS ((tree));
+extern void cxx_print_error_function	(struct diagnostic_context *,
+						 const char *);
+extern void build_self_reference		(void);
+extern int same_signature_p			(tree, tree);
+extern void warn_hidden				(tree);
+extern void maybe_add_class_template_decl_list	(tree, tree, int);
+extern tree get_enclosing_class			(tree);
+int is_base_of_enclosing_class			(tree, tree);
+extern void unreverse_member_declarations       (tree);
+extern void invalidate_class_lookup_cache       (void);
+extern void maybe_note_name_used_in_class       (tree, tree);
+extern void note_name_declared_in_class         (tree, tree);
+extern tree get_vtbl_decl_for_binfo             (tree);
+extern tree get_vtt_name                        (tree);
+extern tree get_primary_binfo                   (tree);
 
 /* in cvt.c */
 extern tree convert_to_reference (tree, tree, int, int, tree);
@@ -3677,161 +3677,161 @@ extern tree build_type_conversion (tree, tree, int);
 extern tree build_expr_type_conversion (int, tree, bool);
 extern tree type_promotes_to (tree);
 extern tree perform_qualification_conversions (tree, tree);
-extern void clone_function_decl                 PARAMS ((tree, int));
-extern void adjust_clone_args			PARAMS ((tree));
+extern void clone_function_decl                 (tree, int);
+extern void adjust_clone_args			(tree);
 
 /* decl.c */
-extern int global_bindings_p			PARAMS ((void));
-extern int kept_level_p				PARAMS ((void));
-extern tree getdecls				PARAMS ((void));
-extern void pushlevel				PARAMS ((int));
-extern tree poplevel				PARAMS ((int,int, int));
-extern void insert_block			PARAMS ((tree));
-extern void set_block				PARAMS ((tree));
-extern tree pushdecl				PARAMS ((tree));
-extern void cxx_init_decl_processing		PARAMS ((void));
+extern int global_bindings_p			(void);
+extern int kept_level_p				(void);
+extern tree getdecls				(void);
+extern void pushlevel				(int);
+extern tree poplevel				(int,int, int);
+extern void insert_block			(tree);
+extern void set_block				(tree);
+extern tree pushdecl				(tree);
+extern void cxx_init_decl_processing		(void);
 enum cp_tree_node_structure_enum cp_tree_node_structure 
-  PARAMS ((union lang_tree_node *));
-extern void cxx_insert_default_attributes	PARAMS ((tree));
-extern bool cxx_mark_addressable		PARAMS ((tree));
-extern void cxx_push_function_context		PARAMS ((struct function *));
-extern void cxx_pop_function_context		PARAMS ((struct function *));
-extern void cxx_mark_function_context		PARAMS ((struct function *));
-extern int toplevel_bindings_p			PARAMS ((void));
-extern int namespace_bindings_p			PARAMS ((void));
-extern void keep_next_level			PARAMS ((int));
-extern int template_parm_scope_p		PARAMS ((void));
-extern void set_class_shadows			PARAMS ((tree));
-extern void maybe_push_cleanup_level		PARAMS ((tree));
-extern void begin_scope                         PARAMS ((scope_kind));
-extern void finish_scope                        PARAMS ((void));
-extern void resume_level			PARAMS ((struct cp_binding_level *));
-extern void delete_block			PARAMS ((tree));
-extern void add_block_current_level		PARAMS ((tree));
-extern void pushlevel_class			PARAMS ((void));
-extern void poplevel_class                      PARAMS ((void));
-extern void print_binding_stack			PARAMS ((void));
-extern void print_binding_level			PARAMS ((struct cp_binding_level *));
-extern void push_namespace			PARAMS ((tree));
-extern void pop_namespace			PARAMS ((void));
-extern void push_nested_namespace		PARAMS ((tree));
-extern void pop_nested_namespace		PARAMS ((tree));
-extern void maybe_push_to_top_level		PARAMS ((int));
-extern void push_to_top_level			PARAMS ((void));
-extern void pop_from_top_level			PARAMS ((void));
-extern void push_switch				PARAMS ((tree));
-extern void pop_switch				PARAMS ((void));
-extern tree identifier_type_value		PARAMS ((tree));
-extern void set_identifier_type_value		PARAMS ((tree, tree));
-extern void pop_everything			PARAMS ((void));
-extern void pushtag				PARAMS ((tree, tree, int));
-extern tree make_anon_name			PARAMS ((void));
-extern void clear_anon_tags			PARAMS ((void));
-extern int decls_match				PARAMS ((tree, tree));
-extern int duplicate_decls			PARAMS ((tree, tree));
-extern tree pushdecl_top_level			PARAMS ((tree));
-extern void pushdecl_class_level		PARAMS ((tree));
-extern tree pushdecl_namespace_level            PARAMS ((tree));
-extern tree push_using_decl                     PARAMS ((tree, tree));
-extern tree push_using_directive                PARAMS ((tree));
-extern void push_class_level_binding		PARAMS ((tree, tree));
-extern tree implicitly_declare			PARAMS ((tree));
-extern tree declare_local_label                 PARAMS ((tree));
-extern tree define_label			PARAMS ((const char *, int, tree));
-extern void check_goto				PARAMS ((tree));
-extern void define_case_label			PARAMS ((void));
-extern tree binding_for_name                    PARAMS ((tree, tree));
-extern tree namespace_binding                   PARAMS ((tree, tree));
-extern void set_namespace_binding               PARAMS ((tree, tree, tree));
-extern tree lookup_namespace_name		PARAMS ((tree, tree));
-extern tree build_typename_type                 PARAMS ((tree, tree, tree, tree));
-extern tree make_typename_type			PARAMS ((tree, tree, tsubst_flags_t));
-extern tree make_unbound_class_template		PARAMS ((tree, tree, tsubst_flags_t));
-extern tree lookup_name_nonclass		PARAMS ((tree));
-extern tree lookup_function_nonclass            PARAMS ((tree, tree));
+  (union lang_tree_node *);
+extern void cxx_insert_default_attributes	(tree);
+extern bool cxx_mark_addressable		(tree);
+extern void cxx_push_function_context		(struct function *);
+extern void cxx_pop_function_context		(struct function *);
+extern void cxx_mark_function_context		(struct function *);
+extern int toplevel_bindings_p			(void);
+extern int namespace_bindings_p			(void);
+extern void keep_next_level			(int);
+extern int template_parm_scope_p		(void);
+extern void set_class_shadows			(tree);
+extern void maybe_push_cleanup_level		(tree);
+extern void begin_scope                         (scope_kind);
+extern void finish_scope                        (void);
+extern void resume_level			(struct cp_binding_level *);
+extern void delete_block			(tree);
+extern void add_block_current_level		(tree);
+extern void pushlevel_class			(void);
+extern void poplevel_class                      (void);
+extern void print_binding_stack			(void);
+extern void print_binding_level			(struct cp_binding_level *);
+extern void push_namespace			(tree);
+extern void pop_namespace			(void);
+extern void push_nested_namespace		(tree);
+extern void pop_nested_namespace		(tree);
+extern void maybe_push_to_top_level		(int);
+extern void push_to_top_level			(void);
+extern void pop_from_top_level			(void);
+extern void push_switch				(tree);
+extern void pop_switch				(void);
+extern tree identifier_type_value		(tree);
+extern void set_identifier_type_value		(tree, tree);
+extern void pop_everything			(void);
+extern void pushtag				(tree, tree, int);
+extern tree make_anon_name			(void);
+extern void clear_anon_tags			(void);
+extern int decls_match				(tree, tree);
+extern int duplicate_decls			(tree, tree);
+extern tree pushdecl_top_level			(tree);
+extern void pushdecl_class_level		(tree);
+extern tree pushdecl_namespace_level            (tree);
+extern tree push_using_decl                     (tree, tree);
+extern tree push_using_directive                (tree);
+extern void push_class_level_binding		(tree, tree);
+extern tree implicitly_declare			(tree);
+extern tree declare_local_label                 (tree);
+extern tree define_label			(const char *, int, tree);
+extern void check_goto				(tree);
+extern void define_case_label			(void);
+extern tree binding_for_name                    (tree, tree);
+extern tree namespace_binding                   (tree, tree);
+extern void set_namespace_binding               (tree, tree, tree);
+extern tree lookup_namespace_name		(tree, tree);
+extern tree build_typename_type                 (tree, tree, tree, tree);
+extern tree make_typename_type			(tree, tree, tsubst_flags_t);
+extern tree make_unbound_class_template		(tree, tree, tsubst_flags_t);
+extern tree lookup_name_nonclass		(tree);
+extern tree lookup_function_nonclass            (tree, tree);
 extern tree lookup_qualified_name               (tree, tree, bool, int);
-extern tree lookup_name				PARAMS ((tree, int));
-extern tree lookup_name_current_level		PARAMS ((tree));
-extern tree lookup_type_current_level		PARAMS ((tree));
+extern tree lookup_name				(tree, int);
+extern tree lookup_name_current_level		(tree);
+extern tree lookup_type_current_level		(tree);
 extern tree lookup_name_real                    (tree, int, int, int, int);
-extern tree namespace_ancestor			PARAMS ((tree, tree));
-extern tree unqualified_namespace_lookup	PARAMS ((tree, int, tree *));
+extern tree namespace_ancestor			(tree, tree);
+extern tree unqualified_namespace_lookup	(tree, int, tree *);
 extern tree check_for_out_of_scope_variable     (tree);
 extern bool lookup_using_namespace (tree, tree, tree, tree, int, tree *);
 extern bool qualified_lookup_using_namespace (tree, tree, tree, int);
-extern tree build_library_fn			PARAMS ((tree, tree));
-extern tree build_library_fn_ptr		PARAMS ((const char *, tree));
-extern tree build_cp_library_fn_ptr		PARAMS ((const char *, tree));
-extern tree push_library_fn			PARAMS ((tree, tree));
-extern tree push_void_library_fn		PARAMS ((tree, tree));
-extern tree push_throw_library_fn		PARAMS ((tree, tree));
-extern int init_type_desc			PARAMS ((void));
-extern tree check_tag_decl			PARAMS ((tree));
-extern tree shadow_tag				PARAMS ((tree));
-extern tree groktypename			PARAMS ((tree));
-extern tree start_decl				PARAMS ((tree, tree, int, tree, tree));
-extern void start_decl_1			PARAMS ((tree));
-extern void cp_finish_decl			PARAMS ((tree, tree, tree, int));
-extern void finish_decl				PARAMS ((tree, tree, tree));
-extern void maybe_inject_for_scope_var          PARAMS ((tree));
-extern tree start_handler_parms                 PARAMS ((tree, tree));
-extern int complete_array_type			PARAMS ((tree, tree, int));
-extern tree build_ptrmemfunc_type		PARAMS ((tree));
+extern tree build_library_fn			(tree, tree);
+extern tree build_library_fn_ptr		(const char *, tree);
+extern tree build_cp_library_fn_ptr		(const char *, tree);
+extern tree push_library_fn			(tree, tree);
+extern tree push_void_library_fn		(tree, tree);
+extern tree push_throw_library_fn		(tree, tree);
+extern int init_type_desc			(void);
+extern tree check_tag_decl			(tree);
+extern tree shadow_tag				(tree);
+extern tree groktypename			(tree);
+extern tree start_decl				(tree, tree, int, tree, tree);
+extern void start_decl_1			(tree);
+extern void cp_finish_decl			(tree, tree, tree, int);
+extern void finish_decl				(tree, tree, tree);
+extern void maybe_inject_for_scope_var          (tree);
+extern tree start_handler_parms                 (tree, tree);
+extern int complete_array_type			(tree, tree, int);
+extern tree build_ptrmemfunc_type		(tree);
 extern tree build_ptrmem_type                   (tree, tree);
 /* the grokdeclarator prototype is in decl.h */
-extern int parmlist_is_exprlist			PARAMS ((tree));
-extern int copy_fn_p				PARAMS ((tree));
-extern tree get_scope_of_declarator             PARAMS ((tree));
-extern void grok_special_member_properties	PARAMS ((tree));
-extern int grok_ctor_properties			PARAMS ((tree, tree));
-extern void grok_op_properties			PARAMS ((tree, int));
+extern int parmlist_is_exprlist			(tree);
+extern int copy_fn_p				(tree);
+extern tree get_scope_of_declarator             (tree);
+extern void grok_special_member_properties	(tree);
+extern int grok_ctor_properties			(tree, tree);
+extern void grok_op_properties			(tree, int);
 extern tree xref_tag				(enum tag_types, tree, tree, bool);
-extern tree xref_tag_from_type			PARAMS ((tree, tree, int));
-extern void xref_basetypes			PARAMS ((tree, tree));
-extern tree start_enum				PARAMS ((tree));
-extern void finish_enum				PARAMS ((tree));
-extern void build_enumerator			PARAMS ((tree, tree, tree));
-extern int start_function			PARAMS ((tree, tree, tree, int));
-extern tree begin_function_body			PARAMS ((void));
-extern void finish_function_body		PARAMS ((tree));
-extern tree finish_function			PARAMS ((int));
-extern tree start_method			PARAMS ((tree, tree, tree));
-extern tree finish_method			PARAMS ((tree));
-extern void maybe_register_incomplete_var       PARAMS ((tree));
-extern void complete_vars			PARAMS ((tree));
-extern void finish_stmt				PARAMS ((void));
-extern void print_other_binding_stack		PARAMS ((struct cp_binding_level *));
-extern void revert_static_member_fn             PARAMS ((tree));
-extern void fixup_anonymous_aggr                PARAMS ((tree));
-extern int check_static_variable_definition     PARAMS ((tree, tree));
-extern tree compute_array_index_type		PARAMS ((tree, tree));
-extern void push_local_binding                  PARAMS ((tree, tree, int));
-extern int push_class_binding                   PARAMS ((tree, tree));
-extern tree check_default_argument              PARAMS ((tree, tree));
-extern tree push_overloaded_decl		PARAMS ((tree, int));
-extern void clear_identifier_class_values       PARAMS ((void));
-extern void storetags                           PARAMS ((tree));
-extern int vtable_decl_p                        PARAMS ((tree, void *));
-extern int vtype_decl_p                         PARAMS ((tree, void *));
-extern int sigtable_decl_p                      PARAMS ((tree, void *));
+extern tree xref_tag_from_type			(tree, tree, int);
+extern void xref_basetypes			(tree, tree);
+extern tree start_enum				(tree);
+extern void finish_enum				(tree);
+extern void build_enumerator			(tree, tree, tree);
+extern int start_function			(tree, tree, tree, int);
+extern tree begin_function_body			(void);
+extern void finish_function_body		(tree);
+extern tree finish_function			(int);
+extern tree start_method			(tree, tree, tree);
+extern tree finish_method			(tree);
+extern void maybe_register_incomplete_var       (tree);
+extern void complete_vars			(tree);
+extern void finish_stmt				(void);
+extern void print_other_binding_stack		(struct cp_binding_level *);
+extern void revert_static_member_fn             (tree);
+extern void fixup_anonymous_aggr                (tree);
+extern int check_static_variable_definition     (tree, tree);
+extern tree compute_array_index_type		(tree, tree);
+extern void push_local_binding                  (tree, tree, int);
+extern int push_class_binding                   (tree, tree);
+extern tree check_default_argument              (tree, tree);
+extern tree push_overloaded_decl		(tree, int);
+extern void clear_identifier_class_values       (void);
+extern void storetags                           (tree);
+extern int vtable_decl_p                        (tree, void *);
+extern int vtype_decl_p                         (tree, void *);
+extern int sigtable_decl_p                      (tree, void *);
 typedef bool (*walk_globals_pred) (tree, void *);
 typedef bool (*walk_globals_fn) (tree *, void *);
 extern bool walk_globals (walk_globals_pred, walk_globals_fn, void *);
 extern bool walk_vtables (walk_globals_pred, walk_globals_fn, void *);
-typedef int (*walk_namespaces_fn)               PARAMS ((tree, void *));
-extern int walk_namespaces                      PARAMS ((walk_namespaces_fn,
-						       void *));
-extern int wrapup_globals_for_namespace         PARAMS ((tree, void *));
-extern tree cp_namespace_decls                  PARAMS ((tree));
-extern tree create_implicit_typedef             PARAMS ((tree, tree));
-extern tree maybe_push_decl                     PARAMS ((tree));
-extern tree build_target_expr_with_type         PARAMS ((tree, tree));
-extern int local_variable_p                     PARAMS ((tree));
-extern int nonstatic_local_decl_p               PARAMS ((tree));
-extern tree declare_global_var                  PARAMS ((tree, tree));
-extern void register_dtor_fn                    PARAMS ((tree));
-extern tmpl_spec_kind current_tmpl_spec_kind    PARAMS ((int));
-extern tree cp_fname_init			PARAMS ((const char *));
+typedef int (*walk_namespaces_fn)               (tree, void *);
+extern int walk_namespaces                      (walk_namespaces_fn,
+						       void *);
+extern int wrapup_globals_for_namespace         (tree, void *);
+extern tree cp_namespace_decls                  (tree);
+extern tree create_implicit_typedef             (tree, tree);
+extern tree maybe_push_decl                     (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 void register_dtor_fn                    (tree);
+extern tmpl_spec_kind current_tmpl_spec_kind    (int);
+extern tree cp_fname_init			(const char *);
 extern bool have_extern_spec;
 
 /* in decl2.c */
@@ -3848,10 +3848,10 @@ extern tree check_classfn (tree, tree);
 extern void check_member_template (tree);
 extern tree grokfield (tree, tree, tree, tree, tree);
 extern tree grokbitfield (tree, tree, tree);
-extern tree groktypefield			PARAMS ((tree, tree));
+extern tree groktypefield			(tree, tree);
 extern tree grokoptypename (tree, tree, tree);
 extern void cplus_decl_attributes (tree *, tree, int);
-extern tree constructor_name_full		PARAMS ((tree));
+extern tree constructor_name_full		(tree);
 extern tree constructor_name (tree);
 extern bool constructor_name_p                  (tree, tree);
 extern void defer_fn (tree);
@@ -3863,17 +3863,20 @@ extern void comdat_linkage (tree);
 extern void import_export_vtable (tree, tree, int);
 extern void import_export_decl (tree);
 extern void import_export_tinfo	(tree, tree, bool);
+extern tree build_cleanup			(tree);
+extern void finish_file				(void);
+extern tree build_expr_from_tree		(tree);
 extern tree build_cleanup			PARAMS ((tree));
 extern void finish_file				PARAMS ((void));
 extern tree build_expr_from_tree		PARAMS ((tree));
 extern tree build_offset_ref_call_from_tree     (tree, tree);
 extern tree build_call_from_tree                (tree, tree, bool);
 extern void set_decl_namespace (tree, tree, bool);
-extern tree current_decl_namespace              PARAMS ((void));
-extern void push_decl_namespace                 PARAMS ((tree));
-extern void pop_decl_namespace                  PARAMS ((void));
-extern void push_scope				PARAMS ((tree));
-extern void pop_scope				PARAMS ((tree));
+extern tree current_decl_namespace              (void);
+extern void push_decl_namespace                 (tree);
+extern void pop_decl_namespace                  (void);
+extern void push_scope				(tree);
+extern void pop_scope				(tree);
 extern void do_namespace_alias (tree, tree);
 extern void do_toplevel_using_decl (tree);
 extern void do_local_using_decl (tree);
@@ -3890,9 +3893,9 @@ extern tree get_guard (tree);
 extern tree get_guard_cond (tree);
 extern tree set_guard (tree);
 
-extern void cp_error_at		PARAMS ((const char *msgid, ...));
-extern void cp_warning_at	PARAMS ((const char *msgid, ...));
-extern void cp_pedwarn_at	PARAMS ((const char *msgid, ...));
+extern void cp_error_at		(const char *msgid, ...);
+extern void cp_warning_at	(const char *msgid, ...);
+extern void cp_pedwarn_at	(const char *msgid, ...);
 
 /* XXX Not i18n clean.  */
 #define cp_deprecated(STR)							\
@@ -3903,100 +3906,100 @@ extern void cp_pedwarn_at	PARAMS ((const char *msgid, ...));
   } while (0)
 
 /* in error.c */
-extern void init_error				PARAMS ((void));
-extern const char *type_as_string		PARAMS ((tree, int));
-extern const char *decl_as_string		PARAMS ((tree, int));
-extern const char *expr_as_string		PARAMS ((tree, int));
-extern const char *context_as_string            PARAMS ((tree, int));
-extern const char *lang_decl_name		PARAMS ((tree, int));
-extern const char *cp_file_of			PARAMS ((tree));
-extern int cp_line_of				PARAMS ((tree));
-extern const char *language_to_string           PARAMS ((enum languages, int));
-extern void print_instantiation_context         PARAMS ((void));
+extern void init_error				(void);
+extern const char *type_as_string		(tree, int);
+extern const char *decl_as_string		(tree, int);
+extern const char *expr_as_string		(tree, int);
+extern const char *context_as_string            (tree, int);
+extern const char *lang_decl_name		(tree, int);
+extern const char *cp_file_of			(tree);
+extern int cp_line_of				(tree);
+extern const char *language_to_string           (enum languages, int);
+extern void print_instantiation_context         (void);
 
 /* in except.c */
-extern void init_exception_processing		PARAMS ((void));
-extern tree expand_start_catch_block		PARAMS ((tree));
-extern void expand_end_catch_block		PARAMS ((void));
-extern void expand_builtin_throw		PARAMS ((void));
-extern void expand_eh_spec_block	        PARAMS ((tree));
-extern void expand_exception_blocks		PARAMS ((void));
-extern tree build_exc_ptr			PARAMS ((void));
-extern tree build_throw				PARAMS ((tree));
-extern void mark_all_runtime_matches            PARAMS ((void));
-extern int nothrow_libfn_p			PARAMS ((tree));
-extern void check_handlers			PARAMS ((tree));
-extern void choose_personality_routine		PARAMS ((enum languages));
+extern void init_exception_processing		(void);
+extern tree expand_start_catch_block		(tree);
+extern void expand_end_catch_block		(void);
+extern void expand_builtin_throw		(void);
+extern void expand_eh_spec_block	        (tree);
+extern void expand_exception_blocks		(void);
+extern tree build_exc_ptr			(void);
+extern tree build_throw				(tree);
+extern void mark_all_runtime_matches            (void);
+extern int nothrow_libfn_p			(tree);
+extern void check_handlers			(tree);
+extern void choose_personality_routine		(enum languages);
 
 /* in expr.c */
-extern rtx cxx_expand_expr			PARAMS ((tree, rtx,
+extern rtx cxx_expand_expr			(tree, rtx,
 							 enum machine_mode,
-							 int));
-extern tree cplus_expand_constant               PARAMS ((tree));
+							 int);
+extern tree cplus_expand_constant               (tree);
 
 /* friend.c */
-extern int is_friend				PARAMS ((tree, tree));
-extern void make_friend_class			PARAMS ((tree, tree));
-extern void add_friend                          PARAMS ((tree, tree));
-extern tree do_friend				PARAMS ((tree, tree, tree, tree, tree, enum overload_flags, tree, int));
+extern int is_friend				(tree, tree);
+extern void make_friend_class			(tree, tree);
+extern void add_friend                          (tree, tree);
+extern tree do_friend				(tree, tree, tree, tree, tree, enum overload_flags, tree, int);
 
 /* in init.c */
 extern tree expand_member_init			(tree, tree);
 extern void emit_mem_initializers		(tree);
-extern tree build_aggr_init			PARAMS ((tree, tree, int));
-extern tree build_init				PARAMS ((tree, tree, int));
-extern int is_aggr_type				PARAMS ((tree, int));
-extern tree get_aggr_from_typedef		PARAMS ((tree, int));
-extern tree get_type_value			PARAMS ((tree));
+extern tree build_aggr_init			(tree, tree, int);
+extern tree build_init				(tree, tree, int);
+extern int is_aggr_type				(tree, int);
+extern tree get_aggr_from_typedef		(tree, int);
+extern tree get_type_value			(tree);
 extern tree build_zero_init       		(tree, bool);
-extern tree build_member_call			PARAMS ((tree, tree, tree));
-extern tree build_offset_ref			PARAMS ((tree, tree));
-extern tree resolve_offset_ref			PARAMS ((tree));
-extern tree build_new				PARAMS ((tree, tree, tree, int));
-extern tree build_vec_init			PARAMS ((tree, tree, int));
-extern tree build_x_delete			PARAMS ((tree, int, tree));
-extern tree build_delete			PARAMS ((tree, tree, special_function_kind, int, int));
-extern void push_base_cleanups			PARAMS ((void));
-extern tree build_vbase_delete			PARAMS ((tree, tree));
-extern tree build_vec_delete			PARAMS ((tree, tree, special_function_kind, int));
-extern tree create_temporary_var                PARAMS ((tree));
-extern void begin_init_stmts                    PARAMS ((tree *, tree *));
-extern tree finish_init_stmts                   PARAMS ((tree, tree));
-extern void initialize_vtbl_ptrs                PARAMS ((tree));
-extern tree build_java_class_ref                PARAMS ((tree));
+extern tree build_member_call			(tree, tree, tree);
+extern tree build_offset_ref			(tree, tree);
+extern tree resolve_offset_ref			(tree);
+extern tree build_new				(tree, tree, tree, int);
+extern tree build_vec_init			(tree, tree, int);
+extern tree build_x_delete			(tree, int, tree);
+extern tree build_delete			(tree, tree, special_function_kind, int, int);
+extern void push_base_cleanups			(void);
+extern tree build_vbase_delete			(tree, tree);
+extern tree build_vec_delete			(tree, tree, special_function_kind, int);
+extern tree create_temporary_var                (tree);
+extern void begin_init_stmts                    (tree *, tree *);
+extern tree finish_init_stmts                   (tree, tree);
+extern void initialize_vtbl_ptrs                (tree);
+extern tree build_java_class_ref                (tree);
 
 /* in input.c */
 
 /* in lex.c */
-extern void cxx_dup_lang_specific_decl		PARAMS ((tree));
-extern tree make_pointer_declarator		PARAMS ((tree, tree));
-extern tree make_reference_declarator		PARAMS ((tree, tree));
-extern tree make_call_declarator		PARAMS ((tree, tree, tree, tree));
-extern void set_quals_and_spec			PARAMS ((tree, tree, tree));
-extern void print_parse_statistics		PARAMS ((void));
-extern void do_pending_inlines			PARAMS ((void));
-extern void yyungetc				PARAMS ((int, int));
-extern void snarf_method			PARAMS ((tree));
-
-extern void note_got_semicolon			PARAMS ((tree));
-extern void note_list_got_semicolon		PARAMS ((tree));
-extern void see_typename			PARAMS ((void));
-extern void unqualified_name_lookup_error       PARAMS ((tree));
-extern tree do_identifier			PARAMS ((tree, tree));
-extern tree do_scoped_id			PARAMS ((tree, tree));
-extern tree identifier_typedecl_value		PARAMS ((tree));
-extern tree build_lang_decl			PARAMS ((enum tree_code, tree, tree));
-extern void retrofit_lang_decl			PARAMS ((tree));
-extern tree copy_decl                           PARAMS ((tree));
-extern tree copy_type                           PARAMS ((tree));
-extern tree cxx_make_type			PARAMS ((enum tree_code));
-extern tree make_aggr_type			PARAMS ((enum tree_code));
-extern void yyerror				PARAMS ((const char *));
-extern void yyhook				PARAMS ((int));
-extern int cp_type_qual_from_rid                PARAMS ((tree));
-extern const char *cxx_init			PARAMS ((const char *));
-extern void cxx_finish PARAMS ((void));
-extern void cxx_init_options PARAMS ((void));
+extern void cxx_dup_lang_specific_decl		(tree);
+extern tree make_pointer_declarator		(tree, tree);
+extern tree make_reference_declarator		(tree, tree);
+extern tree make_call_declarator		(tree, tree, tree, tree);
+extern void set_quals_and_spec			(tree, tree, tree);
+extern void print_parse_statistics		(void);
+extern void do_pending_inlines			(void);
+extern void yyungetc				(int, int);
+extern void snarf_method			(tree);
+
+extern void note_got_semicolon			(tree);
+extern void note_list_got_semicolon		(tree);
+extern void see_typename			(void);
+extern void unqualified_name_lookup_error       (tree);
+extern tree do_identifier			(tree, tree);
+extern tree do_scoped_id			(tree, tree);
+extern tree identifier_typedecl_value		(tree);
+extern tree build_lang_decl			(enum tree_code, tree, tree);
+extern void retrofit_lang_decl			(tree);
+extern tree copy_decl                           (tree);
+extern tree copy_type                           (tree);
+extern tree cxx_make_type			(enum tree_code);
+extern tree make_aggr_type			(enum tree_code);
+extern void yyerror				(const char *);
+extern void yyhook				(int);
+extern int cp_type_qual_from_rid                (tree);
+extern const char *cxx_init			(const char *);
+extern void cxx_finish (void);
+extern void cxx_init_options (void);
 
 /* in method.c */
 extern void init_method	(void);
@@ -4016,61 +4019,61 @@ extern bool calls_setjmp_p (tree);
 extern bool maybe_clone_body (tree);
 
 /* in pt.c */
-extern void check_template_shadow		PARAMS ((tree));
-extern tree get_innermost_template_args         PARAMS ((tree, int));
-extern tree tsubst				PARAMS ((tree, tree, tsubst_flags_t, tree));
-extern tree tsubst_expr				PARAMS ((tree, tree, tsubst_flags_t, tree));
-extern tree tsubst_copy				PARAMS ((tree, tree, tsubst_flags_t, tree));
-extern void maybe_begin_member_template_processing PARAMS ((tree));
-extern void maybe_end_member_template_processing PARAMS ((void));
-extern tree finish_member_template_decl         PARAMS ((tree));
-extern void begin_template_parm_list		PARAMS ((void));
-extern void begin_specialization                PARAMS ((void));
-extern void reset_specialization                PARAMS ((void));
-extern void end_specialization                  PARAMS ((void));
-extern void begin_explicit_instantiation        PARAMS ((void));
-extern void end_explicit_instantiation          PARAMS ((void));
-extern tree check_explicit_specialization       PARAMS ((tree, tree, int, int));
-extern tree process_template_parm		PARAMS ((tree, tree));
-extern tree end_template_parm_list		PARAMS ((tree));
-extern void end_template_decl			PARAMS ((void));
-extern tree current_template_args		PARAMS ((void));
-extern tree push_template_decl			PARAMS ((tree));
-extern tree push_template_decl_real             PARAMS ((tree, int));
-extern void redeclare_class_template            PARAMS ((tree, tree));
-extern tree lookup_template_class		PARAMS ((tree, tree, tree, tree, int, tsubst_flags_t));
-extern tree lookup_template_function            PARAMS ((tree, tree));
-extern int uses_template_parms			PARAMS ((tree));
-extern tree instantiate_class_template		PARAMS ((tree));
-extern tree instantiate_template		PARAMS ((tree, tree));
-extern int fn_type_unification                  PARAMS ((tree, tree, tree, tree, tree, unification_kind_t, int));
-extern tree tinst_for_decl			PARAMS ((void));
-extern void mark_decl_instantiated		PARAMS ((tree, int));
-extern int more_specialized			PARAMS ((tree, tree, int, int));
-extern void mark_class_instantiated		PARAMS ((tree, int));
+extern void check_template_shadow		(tree);
+extern tree get_innermost_template_args         (tree, int);
+extern tree tsubst				(tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_expr				(tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_copy				(tree, tree, tsubst_flags_t, tree);
+extern void maybe_begin_member_template_processing (tree);
+extern void maybe_end_member_template_processing (void);
+extern tree finish_member_template_decl         (tree);
+extern void begin_template_parm_list		(void);
+extern void begin_specialization                (void);
+extern void reset_specialization                (void);
+extern void end_specialization                  (void);
+extern void begin_explicit_instantiation        (void);
+extern void end_explicit_instantiation          (void);
+extern tree check_explicit_specialization       (tree, tree, int, int);
+extern tree process_template_parm		(tree, tree);
+extern tree end_template_parm_list		(tree);
+extern void end_template_decl			(void);
+extern tree current_template_args		(void);
+extern tree push_template_decl			(tree);
+extern tree push_template_decl_real             (tree, int);
+extern void redeclare_class_template            (tree, tree);
+extern tree lookup_template_class		(tree, tree, tree, tree, int, tsubst_flags_t);
+extern tree lookup_template_function            (tree, tree);
+extern int uses_template_parms			(tree);
+extern tree instantiate_class_template		(tree);
+extern tree instantiate_template		(tree, tree);
+extern int fn_type_unification                  (tree, tree, tree, tree, tree, unification_kind_t, int);
+extern tree tinst_for_decl			(void);
+extern void mark_decl_instantiated		(tree, int);
+extern int more_specialized			(tree, tree, int, int);
+extern void mark_class_instantiated		(tree, int);
 extern void do_decl_instantiation		(tree, tree);
-extern void do_type_instantiation		PARAMS ((tree, tree, tsubst_flags_t));
-extern tree instantiate_decl			PARAMS ((tree, int));
-extern tree get_bindings			PARAMS ((tree, tree, tree));
-extern int push_tinst_level			PARAMS ((tree));
-extern void pop_tinst_level			PARAMS ((void));
-extern int more_specialized_class		PARAMS ((tree, tree));
-extern int is_member_template                   PARAMS ((tree));
-extern int comp_template_parms                  PARAMS ((tree, tree));
-extern int template_class_depth                 PARAMS ((tree));
-extern int is_specialization_of                 PARAMS ((tree, tree));
-extern int comp_template_args                   PARAMS ((tree, tree));
-extern void maybe_process_partial_specialization PARAMS ((tree));
-extern void maybe_check_template_type           PARAMS ((tree));
-extern tree most_specialized_instantiation      PARAMS ((tree));
-extern void print_candidates                    PARAMS ((tree));
-extern int instantiate_pending_templates        PARAMS ((void));
-extern tree tsubst_default_argument             PARAMS ((tree, tree, tree));
-extern tree most_general_template		PARAMS ((tree));
-extern tree get_mostly_instantiated_function_type PARAMS ((tree));
-extern int problematic_instantiation_changed    PARAMS ((void));
-extern void record_last_problematic_instantiation PARAMS ((void));
-extern tree current_instantiation               PARAMS ((void));
+extern void do_type_instantiation		(tree, tree, tsubst_flags_t);
+extern tree instantiate_decl			(tree, int);
+extern tree get_bindings			(tree, tree, tree);
+extern int push_tinst_level			(tree);
+extern void pop_tinst_level			(void);
+extern int more_specialized_class		(tree, tree);
+extern int is_member_template                   (tree);
+extern int comp_template_parms                  (tree, tree);
+extern int template_class_depth                 (tree);
+extern int is_specialization_of                 (tree, tree);
+extern int comp_template_args                   (tree, tree);
+extern void maybe_process_partial_specialization (tree);
+extern void maybe_check_template_type           (tree);
+extern tree most_specialized_instantiation      (tree);
+extern void print_candidates                    (tree);
+extern int instantiate_pending_templates        (void);
+extern tree tsubst_default_argument             (tree, tree, tree);
+extern tree most_general_template		(tree);
+extern tree get_mostly_instantiated_function_type (tree);
+extern int problematic_instantiation_changed    (void);
+extern void record_last_problematic_instantiation (void);
+extern tree current_instantiation               (void);
 extern tree maybe_get_template_decl_from_type_decl (tree);
 extern int processing_template_parmlist;
 
@@ -4091,301 +4094,301 @@ extern bool unemitted_tinfo_decl_p (tree, void *);
 extern bool emit_tinfo_decl (tree *, void *);
 
 /* in search.c */
-extern tree lookup_base PARAMS ((tree, tree, base_access, base_kind *));
-extern int types_overlap_p			PARAMS ((tree, tree));
-extern tree get_vbase				PARAMS ((tree, tree));
-extern tree get_dynamic_cast_base_type          PARAMS ((tree, tree));
-extern void type_access_control			PARAMS ((tree, tree));
-extern int accessible_p                         PARAMS ((tree, tree));
-extern tree lookup_field			PARAMS ((tree, tree, int, int));
-extern int lookup_fnfields_1                    PARAMS ((tree, tree));
-extern tree lookup_fnfields			PARAMS ((tree, tree, int));
-extern tree lookup_member			PARAMS ((tree, tree, int, int));
-extern int look_for_overrides			PARAMS ((tree, tree));
-extern void get_pure_virtuals		        PARAMS ((tree));
-extern void get_vbase_types			PARAMS ((tree));
-extern void maybe_suppress_debug_info		PARAMS ((tree));
-extern void note_debug_info_needed		PARAMS ((tree));
-extern void push_class_decls			PARAMS ((tree));
-extern void pop_class_decls			PARAMS ((void));
-extern void unuse_fields			PARAMS ((tree));
-extern void print_search_statistics		PARAMS ((void));
-extern void init_search_processing		PARAMS ((void));
-extern void reinit_search_statistics		PARAMS ((void));
-extern tree current_scope			PARAMS ((void));
-extern int at_function_scope_p                  PARAMS ((void));
+extern tree lookup_base (tree, tree, base_access, base_kind *);
+extern int types_overlap_p			(tree, tree);
+extern tree get_vbase				(tree, tree);
+extern tree get_dynamic_cast_base_type          (tree, tree);
+extern void type_access_control			(tree, tree);
+extern int accessible_p                         (tree, tree);
+extern tree lookup_field			(tree, tree, int, int);
+extern int lookup_fnfields_1                    (tree, tree);
+extern tree lookup_fnfields			(tree, tree, int);
+extern tree lookup_member			(tree, tree, int, int);
+extern int look_for_overrides			(tree, tree);
+extern void get_pure_virtuals		        (tree);
+extern void get_vbase_types			(tree);
+extern void maybe_suppress_debug_info		(tree);
+extern void note_debug_info_needed		(tree);
+extern void push_class_decls			(tree);
+extern void pop_class_decls			(void);
+extern void unuse_fields			(tree);
+extern void print_search_statistics		(void);
+extern void init_search_processing		(void);
+extern void reinit_search_statistics		(void);
+extern tree current_scope			(void);
+extern int at_function_scope_p                  (void);
 extern bool at_class_scope_p                    (void);
-extern tree context_for_name_lookup		PARAMS ((tree));
-extern tree lookup_conversions			PARAMS ((tree));
-extern tree binfo_for_vtable			PARAMS ((tree));
-extern tree binfo_from_vbase			PARAMS ((tree));
-extern tree look_for_overrides_here		PARAMS ((tree, tree));
-extern int check_final_overrider		PARAMS ((tree, tree));
-extern tree dfs_walk                            PARAMS ((tree,
+extern tree context_for_name_lookup		(tree);
+extern tree lookup_conversions			(tree);
+extern tree binfo_for_vtable			(tree);
+extern tree binfo_from_vbase			(tree);
+extern tree look_for_overrides_here		(tree, tree);
+extern int check_final_overrider		(tree, tree);
+extern tree dfs_walk                            (tree,
 						       tree (*) (tree, void *),
 						       tree (*) (tree, void *),
-						       void *));
-extern tree dfs_walk_real                      PARAMS ((tree,
+						       void *);
+extern tree dfs_walk_real                      (tree,
 						       tree (*) (tree, void *),
 						       tree (*) (tree, void *),
 						       tree (*) (tree, void *),
-						       void *));
-extern tree dfs_unmark                          PARAMS ((tree, void *));
-extern tree markedp                             PARAMS ((tree, void *));
-extern tree unmarkedp                           PARAMS ((tree, void *));
-extern tree dfs_unmarked_real_bases_queue_p     PARAMS ((tree, void *));
-extern tree dfs_marked_real_bases_queue_p       PARAMS ((tree, void *));
-extern tree dfs_skip_vbases                     PARAMS ((tree, void *));
-extern tree marked_vtable_pathp                 PARAMS ((tree, void *));
-extern tree unmarked_vtable_pathp               PARAMS ((tree, void *));
-extern tree find_vbase_instance                 PARAMS ((tree, tree));
-extern tree binfo_for_vbase                     PARAMS ((tree, tree));
-extern tree binfo_via_virtual                   PARAMS ((tree, tree));
+						       void *);
+extern tree dfs_unmark                          (tree, void *);
+extern tree markedp                             (tree, void *);
+extern tree unmarkedp                           (tree, void *);
+extern tree dfs_unmarked_real_bases_queue_p     (tree, void *);
+extern tree dfs_marked_real_bases_queue_p       (tree, void *);
+extern tree dfs_skip_vbases                     (tree, void *);
+extern tree marked_vtable_pathp                 (tree, void *);
+extern tree unmarked_vtable_pathp               (tree, void *);
+extern tree find_vbase_instance                 (tree, tree);
+extern tree binfo_for_vbase                     (tree, tree);
+extern tree binfo_via_virtual                   (tree, tree);
 extern tree build_baselink                      (tree, tree, tree, tree);
 extern tree adjust_result_of_qualified_name_lookup
                                                 (tree, tree, tree);
 /* in semantics.c */
-extern void init_cp_semantics                   PARAMS ((void));
-extern tree finish_expr_stmt                    PARAMS ((tree));
-extern tree begin_if_stmt                       PARAMS ((void));
-extern void finish_if_stmt_cond                 PARAMS ((tree, tree));
-extern tree finish_then_clause                  PARAMS ((tree));
-extern void begin_else_clause                   PARAMS ((void));
-extern void finish_else_clause                  PARAMS ((tree));
-extern void finish_if_stmt                      PARAMS ((void));
-extern tree begin_while_stmt                    PARAMS ((void));
-extern void finish_while_stmt_cond              PARAMS ((tree, tree));
-extern void finish_while_stmt                   PARAMS ((tree));
-extern tree begin_do_stmt                       PARAMS ((void));
-extern void finish_do_body                      PARAMS ((tree));
-extern void finish_do_stmt                      PARAMS ((tree, tree));
-extern tree finish_return_stmt                  PARAMS ((tree));
-extern tree begin_for_stmt                      PARAMS ((void));
-extern void finish_for_init_stmt                PARAMS ((tree));
-extern void finish_for_cond                     PARAMS ((tree, tree));
-extern void finish_for_expr                     PARAMS ((tree, tree));
-extern void finish_for_stmt                     PARAMS ((tree));
-extern tree finish_break_stmt                   PARAMS ((void));
-extern tree finish_continue_stmt                PARAMS ((void));
-extern tree begin_switch_stmt                   PARAMS ((void));
-extern void finish_switch_cond                  PARAMS ((tree, tree));
-extern void finish_switch_stmt                  PARAMS ((tree));
-extern tree finish_case_label                   PARAMS ((tree, tree));
-extern tree finish_goto_stmt                    PARAMS ((tree));
-extern tree begin_try_block                     PARAMS ((void));
-extern void finish_try_block                    PARAMS ((tree));
-extern tree begin_eh_spec_block			PARAMS ((void));
-extern void finish_eh_spec_block		PARAMS ((tree, tree));
-extern void finish_handler_sequence             PARAMS ((tree));
-extern tree begin_function_try_block            PARAMS ((void));
-extern void finish_function_try_block           PARAMS ((tree));
-extern void finish_function_handler_sequence    PARAMS ((tree));
-extern void finish_cleanup_try_block            PARAMS ((tree));
-extern tree begin_handler                       PARAMS ((void));
-extern void finish_handler_parms                PARAMS ((tree, tree));
-extern void begin_catch_block                   PARAMS ((tree));
-extern void finish_handler                      PARAMS ((tree));
-extern void finish_cleanup                      PARAMS ((tree, tree));
-extern tree begin_compound_stmt                 PARAMS ((int));
-extern tree finish_compound_stmt                PARAMS ((int, tree));
-extern tree finish_asm_stmt                     PARAMS ((tree, tree, tree, tree, tree));
-extern tree finish_label_stmt                   PARAMS ((tree));
-extern void finish_label_decl                   PARAMS ((tree));
-extern void finish_subobject                    PARAMS ((tree));
-extern tree finish_parenthesized_expr           PARAMS ((tree));
-extern tree finish_non_static_data_member       PARAMS ((tree, tree));
-extern tree begin_stmt_expr                     PARAMS ((void));
-extern tree finish_stmt_expr                    PARAMS ((tree));
+extern void init_cp_semantics                   (void);
+extern tree finish_expr_stmt                    (tree);
+extern tree begin_if_stmt                       (void);
+extern void finish_if_stmt_cond                 (tree, tree);
+extern tree finish_then_clause                  (tree);
+extern void begin_else_clause                   (void);
+extern void finish_else_clause                  (tree);
+extern void finish_if_stmt                      (void);
+extern tree begin_while_stmt                    (void);
+extern void finish_while_stmt_cond              (tree, tree);
+extern void finish_while_stmt                   (tree);
+extern tree begin_do_stmt                       (void);
+extern void finish_do_body                      (tree);
+extern void finish_do_stmt                      (tree, tree);
+extern tree finish_return_stmt                  (tree);
+extern tree begin_for_stmt                      (void);
+extern void finish_for_init_stmt                (tree);
+extern void finish_for_cond                     (tree, tree);
+extern void finish_for_expr                     (tree, tree);
+extern void finish_for_stmt                     (tree);
+extern tree finish_break_stmt                   (void);
+extern tree finish_continue_stmt                (void);
+extern tree begin_switch_stmt                   (void);
+extern void finish_switch_cond                  (tree, tree);
+extern void finish_switch_stmt                  (tree);
+extern tree finish_case_label                   (tree, tree);
+extern tree finish_goto_stmt                    (tree);
+extern tree begin_try_block                     (void);
+extern void finish_try_block                    (tree);
+extern tree begin_eh_spec_block			(void);
+extern void finish_eh_spec_block		(tree, tree);
+extern void finish_handler_sequence             (tree);
+extern tree begin_function_try_block            (void);
+extern void finish_function_try_block           (tree);
+extern void finish_function_handler_sequence    (tree);
+extern void finish_cleanup_try_block            (tree);
+extern tree begin_handler                       (void);
+extern void finish_handler_parms                (tree, tree);
+extern void begin_catch_block                   (tree);
+extern void finish_handler                      (tree);
+extern void finish_cleanup                      (tree, tree);
+extern tree begin_compound_stmt                 (int);
+extern tree finish_compound_stmt                (int, tree);
+extern tree finish_asm_stmt                     (tree, tree, tree, tree, tree);
+extern tree finish_label_stmt                   (tree);
+extern void finish_label_decl                   (tree);
+extern void finish_subobject                    (tree);
+extern tree finish_parenthesized_expr           (tree);
+extern tree finish_non_static_data_member       (tree, tree);
+extern tree begin_stmt_expr                     (void);
+extern tree finish_stmt_expr                    (tree);
 extern tree finish_call_expr                    (tree, tree, bool);
-extern tree finish_increment_expr               PARAMS ((tree, enum tree_code));
-extern tree finish_this_expr                    PARAMS ((void));
-extern tree finish_object_call_expr             PARAMS ((tree, tree, tree));
-extern tree finish_qualified_object_call_expr   PARAMS ((tree, tree, tree));
+extern tree finish_increment_expr               (tree, enum tree_code);
+extern tree finish_this_expr                    (void);
+extern tree finish_object_call_expr             (tree, tree, tree);
+extern tree finish_qualified_object_call_expr   (tree, tree, tree);
 extern tree finish_pseudo_destructor_expr       (tree, tree, tree);
-extern tree finish_unary_op_expr                PARAMS ((enum tree_code, tree));
+extern tree finish_unary_op_expr                (enum tree_code, tree);
 extern tree finish_compound_literal             (tree, tree);
 extern tree finish_fname                        (tree);
-extern void save_type_access_control		PARAMS ((tree));
-extern void reset_type_access_control           PARAMS ((void));
-extern void decl_type_access_control		PARAMS ((tree));
+extern void save_type_access_control		(tree);
+extern void reset_type_access_control           (void);
+extern void decl_type_access_control		(tree);
 extern int begin_function_definition            (tree, tree, tree);
-extern tree begin_constructor_declarator        PARAMS ((tree, tree));
-extern tree finish_declarator                   PARAMS ((tree, tree, tree, tree, int));
-extern void finish_translation_unit             PARAMS ((void));
-extern tree finish_template_type_parm           PARAMS ((tree, tree));
-extern tree finish_template_template_parm       PARAMS ((tree, tree));
-extern tree finish_parmlist                     PARAMS ((tree, int));
-extern tree begin_class_definition              PARAMS ((tree));
-extern tree finish_class_definition             PARAMS ((tree, tree, int, int));
-extern void finish_default_args                 PARAMS ((void));
-extern tree finish_member_class_template        PARAMS ((tree));
-extern void finish_template_decl                PARAMS ((tree));
-extern tree finish_template_type                PARAMS ((tree, tree, int));
-extern void enter_scope_of                      PARAMS ((tree));
-extern tree finish_base_specifier               PARAMS ((tree, tree));
-extern void finish_member_declaration           PARAMS ((tree));
-extern void check_multiple_declarators          PARAMS ((void));
-extern tree finish_typeof			PARAMS ((tree));
-extern tree finish_sizeof			PARAMS ((tree));
-extern tree finish_alignof			PARAMS ((tree));
-extern void finish_decl_cleanup                 PARAMS ((tree, tree));
-extern void finish_eh_cleanup                   PARAMS ((tree));
-extern void expand_body                         PARAMS ((tree));
-extern tree nullify_returns_r		      PARAMS ((tree *, int *, void *));
+extern tree begin_constructor_declarator        (tree, tree);
+extern tree finish_declarator                   (tree, tree, tree, tree, int);
+extern void finish_translation_unit             (void);
+extern tree finish_template_type_parm           (tree, tree);
+extern tree finish_template_template_parm       (tree, tree);
+extern tree finish_parmlist                     (tree, int);
+extern tree begin_class_definition              (tree);
+extern tree finish_class_definition             (tree, tree, int, int);
+extern void finish_default_args                 (void);
+extern tree finish_member_class_template        (tree);
+extern void finish_template_decl                (tree);
+extern tree finish_template_type                (tree, tree, int);
+extern void enter_scope_of                      (tree);
+extern tree finish_base_specifier               (tree, tree);
+extern void finish_member_declaration           (tree);
+extern void check_multiple_declarators          (void);
+extern tree finish_typeof			(tree);
+extern tree finish_sizeof			(tree);
+extern tree finish_alignof			(tree);
+extern void finish_decl_cleanup                 (tree, tree);
+extern void finish_eh_cleanup                   (tree);
+extern void expand_body                         (tree);
+extern tree nullify_returns_r		      (tree *, int *, void *);
 extern void do_pushlevel                        (scope_kind);
-extern tree do_poplevel                         PARAMS ((void));
+extern tree do_poplevel                         (void);
 extern void begin_mem_initializers              (void);
-extern void finish_mem_initializers             PARAMS ((tree));
-extern void setup_vtbl_ptr			PARAMS ((tree, tree));
-extern void clear_out_block                     PARAMS ((void));
-extern tree begin_global_stmt_expr              PARAMS ((void));
-extern tree finish_global_stmt_expr             PARAMS ((tree));
+extern void finish_mem_initializers             (tree);
+extern void setup_vtbl_ptr			(tree, tree);
+extern void clear_out_block                     (void);
+extern tree begin_global_stmt_expr              (void);
+extern tree finish_global_stmt_expr             (tree);
 extern tree check_template_template_default_arg (tree);
 
 /* in tree.c */
-extern void lang_check_failed			PARAMS ((const char *, int,
-							 const char *));
-extern tree stabilize_expr			PARAMS ((tree, tree *));
-extern tree cxx_unsave_expr_now			PARAMS ((tree));
-extern tree cxx_maybe_build_cleanup		PARAMS ((tree));
-extern void init_tree			        PARAMS ((void));
-extern int pod_type_p				PARAMS ((tree));
-extern int zero_init_p				PARAMS ((tree));
-extern tree canonical_type_variant              PARAMS ((tree));
-extern void unshare_base_binfos			PARAMS ((tree));
-extern int member_p				PARAMS ((tree));
-extern cp_lvalue_kind real_lvalue_p		PARAMS ((tree));
-extern int non_cast_lvalue_p			PARAMS ((tree));
-extern int non_cast_lvalue_or_else		PARAMS ((tree, const char *));
-extern tree build_min				PARAMS ((enum tree_code, tree,
-							 ...));
-extern tree build_min_nt			PARAMS ((enum tree_code, ...));
-extern tree build_cplus_new			PARAMS ((tree, tree));
-extern tree get_target_expr			PARAMS ((tree));
-extern tree break_out_calls			PARAMS ((tree));
-extern tree build_cplus_method_type		PARAMS ((tree, tree, tree));
-extern tree build_cplus_staticfn_type		PARAMS ((tree, tree, tree));
-extern tree build_cplus_array_type		PARAMS ((tree, tree));
-extern tree hash_tree_cons			PARAMS ((tree, tree, tree));
-extern tree hash_tree_chain			PARAMS ((tree, tree));
-extern tree hash_chainon			PARAMS ((tree, tree));
-extern tree make_binfo				PARAMS ((tree, tree, tree, tree));
-extern tree reverse_path			PARAMS ((tree));
-extern int count_functions			PARAMS ((tree));
-extern int is_overloaded_fn			PARAMS ((tree));
-extern tree get_first_fn			PARAMS ((tree));
-extern int bound_pmf_p				PARAMS ((tree));
-extern tree ovl_cons                            PARAMS ((tree, tree));
-extern tree build_overload                      PARAMS ((tree, tree));
-extern tree function_arg_chain			PARAMS ((tree));
-extern int promotes_to_aggr_type		PARAMS ((tree, enum tree_code));
-extern int is_aggr_type_2			PARAMS ((tree, tree));
-extern const char *cxx_printable_name		PARAMS ((tree, int));
-extern tree build_exception_variant		PARAMS ((tree, tree));
-extern tree bind_template_template_parm		PARAMS ((tree, tree));
-extern tree array_type_nelts_total		PARAMS ((tree));
-extern tree array_type_nelts_top		PARAMS ((tree));
-extern tree break_out_target_exprs		PARAMS ((tree));
-extern tree get_type_decl			PARAMS ((tree));
-extern tree vec_binfo_member			PARAMS ((tree, tree));
-extern tree decl_namespace_context		PARAMS ((tree));
-extern tree lvalue_type				PARAMS ((tree));
-extern tree error_type				PARAMS ((tree));
-extern tree build_zc_wrapper			PARAMS ((struct z_candidate *));
-extern tree build_srcloc_here			PARAMS ((void));
-extern int varargs_function_p			PARAMS ((tree));
-extern int really_overloaded_fn			PARAMS ((tree));
-extern int cp_tree_equal			PARAMS ((tree, tree));
-extern tree no_linkage_check			PARAMS ((tree));
-extern void debug_binfo				PARAMS ((tree));
-extern tree build_dummy_object			PARAMS ((tree));
-extern tree maybe_dummy_object			PARAMS ((tree, tree *));
-extern int is_dummy_object			PARAMS ((tree));
+extern void lang_check_failed			(const char *, int,
+							 const char *);
+extern tree stabilize_expr			(tree, tree *);
+extern tree cxx_unsave_expr_now			(tree);
+extern tree cxx_maybe_build_cleanup		(tree);
+extern void init_tree			        (void);
+extern int pod_type_p				(tree);
+extern int zero_init_p				(tree);
+extern tree canonical_type_variant              (tree);
+extern void unshare_base_binfos			(tree);
+extern int member_p				(tree);
+extern cp_lvalue_kind real_lvalue_p		(tree);
+extern int non_cast_lvalue_p			(tree);
+extern int non_cast_lvalue_or_else		(tree, const char *);
+extern tree build_min				(enum tree_code, tree,
+							 ...);
+extern tree build_min_nt			(enum tree_code, ...);
+extern tree build_cplus_new			(tree, tree);
+extern tree get_target_expr			(tree);
+extern tree break_out_calls			(tree);
+extern tree build_cplus_method_type		(tree, tree, tree);
+extern tree build_cplus_staticfn_type		(tree, tree, tree);
+extern tree build_cplus_array_type		(tree, tree);
+extern tree hash_tree_cons			(tree, tree, tree);
+extern tree hash_tree_chain			(tree, tree);
+extern tree hash_chainon			(tree, tree);
+extern tree make_binfo				(tree, tree, tree, tree);
+extern tree reverse_path			(tree);
+extern int count_functions			(tree);
+extern int is_overloaded_fn			(tree);
+extern tree get_first_fn			(tree);
+extern int bound_pmf_p				(tree);
+extern tree ovl_cons                            (tree, tree);
+extern tree build_overload                      (tree, tree);
+extern tree function_arg_chain			(tree);
+extern int promotes_to_aggr_type		(tree, enum tree_code);
+extern int is_aggr_type_2			(tree, tree);
+extern const char *cxx_printable_name		(tree, int);
+extern tree build_exception_variant		(tree, tree);
+extern tree bind_template_template_parm		(tree, tree);
+extern tree array_type_nelts_total		(tree);
+extern tree array_type_nelts_top		(tree);
+extern tree break_out_target_exprs		(tree);
+extern tree get_type_decl			(tree);
+extern tree vec_binfo_member			(tree, tree);
+extern tree decl_namespace_context		(tree);
+extern tree lvalue_type				(tree);
+extern tree error_type				(tree);
+extern tree build_zc_wrapper			(struct z_candidate *);
+extern tree build_srcloc_here			(void);
+extern int varargs_function_p			(tree);
+extern int really_overloaded_fn			(tree);
+extern int cp_tree_equal			(tree, tree);
+extern tree no_linkage_check			(tree);
+extern void debug_binfo				(tree);
+extern tree build_dummy_object			(tree);
+extern tree maybe_dummy_object			(tree, tree *);
+extern int is_dummy_object			(tree);
 extern const struct attribute_spec cxx_attribute_table[];
-extern tree make_ptrmem_cst                     PARAMS ((tree, tree));
-extern tree cp_build_qualified_type_real        PARAMS ((tree, int, tsubst_flags_t));
+extern tree make_ptrmem_cst                     (tree, tree);
+extern tree cp_build_qualified_type_real        (tree, int, tsubst_flags_t);
 #define cp_build_qualified_type(TYPE, QUALS) \
   cp_build_qualified_type_real ((TYPE), (QUALS), tf_error | tf_warning)
-extern tree build_shared_int_cst                PARAMS ((int));
-extern special_function_kind special_function_p PARAMS ((tree));
+extern tree build_shared_int_cst                (int);
+extern special_function_kind special_function_p (tree);
 extern bool name_p                              (tree);
-extern int count_trees                          PARAMS ((tree));
-extern int char_type_p                          PARAMS ((tree));
-extern void verify_stmt_tree                    PARAMS ((tree));
-extern tree find_tree                           PARAMS ((tree, tree));
-extern linkage_kind decl_linkage                PARAMS ((tree));
-extern tree cp_walk_subtrees PARAMS ((tree*, int*, walk_tree_fn,
-				      void*, void*));
-extern int cp_cannot_inline_tree_fn PARAMS ((tree*));
-extern tree cp_add_pending_fn_decls PARAMS ((void*,tree));
-extern int cp_is_overload_p PARAMS ((tree));
-extern int cp_auto_var_in_fn_p PARAMS ((tree,tree));
-extern tree cp_copy_res_decl_for_inlining PARAMS ((tree, tree, tree, void*,
-						   int*, tree));
-extern int cp_start_inlining			PARAMS ((tree));
-extern void cp_end_inlining			PARAMS ((tree));
+extern int count_trees                          (tree);
+extern int char_type_p                          (tree);
+extern void verify_stmt_tree                    (tree);
+extern tree find_tree                           (tree, tree);
+extern linkage_kind decl_linkage                (tree);
+extern tree cp_walk_subtrees (tree*, int*, walk_tree_fn,
+				      void*, void*);
+extern int cp_cannot_inline_tree_fn (tree*);
+extern tree cp_add_pending_fn_decls (void*,tree);
+extern int cp_is_overload_p (tree);
+extern int cp_auto_var_in_fn_p (tree,tree);
+extern tree cp_copy_res_decl_for_inlining (tree, tree, tree, void*,
+						   int*, tree);
+extern int cp_start_inlining			(tree);
+extern void cp_end_inlining			(tree);
 
 /* in typeck.c */
-extern int string_conv_p			PARAMS ((tree, tree, int));
-extern tree cp_truthvalue_conversion		PARAMS ((tree));
-extern tree condition_conversion		PARAMS ((tree));
-extern tree target_type				PARAMS ((tree));
-extern tree require_complete_type		PARAMS ((tree));
-extern tree complete_type			PARAMS ((tree));
-extern tree complete_type_or_diagnostic         PARAMS ((tree, tree, int));
+extern int string_conv_p			(tree, tree, int);
+extern tree cp_truthvalue_conversion		(tree);
+extern tree condition_conversion		(tree);
+extern tree target_type				(tree);
+extern tree require_complete_type		(tree);
+extern tree complete_type			(tree);
+extern tree complete_type_or_diagnostic         (tree, tree, int);
 #define complete_type_or_else(T,V) (complete_type_or_diagnostic ((T), (V), 0))
-extern int type_unknown_p			PARAMS ((tree));
-extern tree commonparms				PARAMS ((tree, tree));
-extern tree original_type			PARAMS ((tree));
-extern int comp_except_specs			PARAMS ((tree, tree, int));
-extern int comptypes				PARAMS ((tree, tree, int));
-extern int comp_target_types			PARAMS ((tree, tree, int));
-extern int compparms				PARAMS ((tree, tree));
-extern int comp_cv_qualification                PARAMS ((tree, tree));
-extern int comp_cv_qual_signature               PARAMS ((tree, tree));
-extern tree expr_sizeof				PARAMS ((tree));
-extern tree cxx_sizeof_or_alignof_type    PARAMS ((tree, enum tree_code, int));
+extern int type_unknown_p			(tree);
+extern tree commonparms				(tree, tree);
+extern tree original_type			(tree);
+extern int comp_except_specs			(tree, tree, int);
+extern int comptypes				(tree, tree, int);
+extern int comp_target_types			(tree, tree, int);
+extern int compparms				(tree, tree);
+extern int comp_cv_qualification                (tree, tree);
+extern int comp_cv_qual_signature               (tree, tree);
+extern tree expr_sizeof				(tree);
+extern tree cxx_sizeof_or_alignof_type    (tree, enum tree_code, int);
 #define cxx_sizeof_nowarn(T) cxx_sizeof_or_alignof_type (T, SIZEOF_EXPR, false)
-extern tree inline_conversion			PARAMS ((tree));
-extern tree decay_conversion			PARAMS ((tree));
+extern tree inline_conversion			(tree);
+extern tree decay_conversion			(tree);
 extern tree build_class_member_access_expr      (tree, tree, tree, bool);
 extern tree finish_class_member_access_expr     (tree, tree);
-extern tree build_x_indirect_ref		PARAMS ((tree, const char *));
-extern tree build_indirect_ref			PARAMS ((tree, const char *));
-extern tree build_array_ref			PARAMS ((tree, tree));
-extern tree get_member_function_from_ptrfunc	PARAMS ((tree *, tree));
-extern tree build_function_call_real		PARAMS ((tree, tree, int, int));
-extern tree build_function_call_maybe		PARAMS ((tree, tree));
-extern tree convert_arguments			PARAMS ((tree, tree, tree, int));
-extern tree build_x_binary_op			PARAMS ((enum tree_code, tree, tree));
-extern tree build_x_unary_op			PARAMS ((enum tree_code, tree));
-extern tree unary_complex_lvalue		PARAMS ((enum tree_code, tree));
-extern tree build_x_conditional_expr		PARAMS ((tree, tree, tree));
-extern tree build_x_compound_expr		PARAMS ((tree));
-extern tree build_compound_expr			PARAMS ((tree));
-extern tree build_static_cast			PARAMS ((tree, tree));
-extern tree build_reinterpret_cast		PARAMS ((tree, tree));
-extern tree build_const_cast			PARAMS ((tree, tree));
-extern tree build_c_cast			PARAMS ((tree, tree));
-extern tree build_x_modify_expr			PARAMS ((tree, enum tree_code, tree));
-extern tree build_modify_expr			PARAMS ((tree, enum tree_code, tree));
-extern tree dubious_conversion_warnings         PARAMS ((tree, tree, const char *, tree, int));
-extern tree convert_for_initialization		PARAMS ((tree, tree, tree, int, const char *, tree, int));
-extern int comp_ptr_ttypes			PARAMS ((tree, tree));
-extern int ptr_reasonably_similar		PARAMS ((tree, tree));
-extern tree build_ptrmemfunc			PARAMS ((tree, tree, int));
-extern int cp_type_quals                        PARAMS ((tree));
-extern int cp_has_mutable_p                     PARAMS ((tree));
-extern int at_least_as_qualified_p              PARAMS ((tree, tree));
-extern int more_qualified_p                     PARAMS ((tree, tree));
-extern tree build_ptrmemfunc1                   PARAMS ((tree, tree, tree));
-extern void expand_ptrmemfunc_cst               PARAMS ((tree, tree *, tree *));
-extern tree pfn_from_ptrmemfunc                 PARAMS ((tree));
-extern tree type_after_usual_arithmetic_conversions PARAMS ((tree, tree));
-extern tree composite_pointer_type              PARAMS ((tree, tree, tree, tree,
-						       const char*));
-extern tree merge_types				PARAMS ((tree, tree));
-extern tree check_return_expr                   PARAMS ((tree));
+extern tree build_x_indirect_ref		(tree, const char *);
+extern tree build_indirect_ref			(tree, const char *);
+extern tree build_array_ref			(tree, tree);
+extern tree get_member_function_from_ptrfunc	(tree *, tree);
+extern tree build_function_call_real		(tree, tree, int, int);
+extern tree build_function_call_maybe		(tree, tree);
+extern tree convert_arguments			(tree, tree, tree, int);
+extern tree build_x_binary_op			(enum tree_code, tree, tree);
+extern tree build_x_unary_op			(enum tree_code, tree);
+extern tree unary_complex_lvalue		(enum tree_code, tree);
+extern tree build_x_conditional_expr		(tree, tree, tree);
+extern tree build_x_compound_expr		(tree);
+extern tree build_compound_expr			(tree);
+extern tree build_static_cast			(tree, tree);
+extern tree build_reinterpret_cast		(tree, tree);
+extern tree build_const_cast			(tree, tree);
+extern tree build_c_cast			(tree, tree);
+extern tree build_x_modify_expr			(tree, enum tree_code, tree);
+extern tree build_modify_expr			(tree, enum tree_code, tree);
+extern tree dubious_conversion_warnings         (tree, tree, const char *, tree, int);
+extern tree convert_for_initialization		(tree, tree, tree, int, const char *, tree, int);
+extern int comp_ptr_ttypes			(tree, tree);
+extern int ptr_reasonably_similar		(tree, tree);
+extern tree build_ptrmemfunc			(tree, tree, int);
+extern int cp_type_quals                        (tree);
+extern int cp_has_mutable_p                     (tree);
+extern int at_least_as_qualified_p              (tree, tree);
+extern int more_qualified_p                     (tree, tree);
+extern tree build_ptrmemfunc1                   (tree, tree, tree);
+extern void expand_ptrmemfunc_cst               (tree, tree *, tree *);
+extern tree pfn_from_ptrmemfunc                 (tree);
+extern tree type_after_usual_arithmetic_conversions (tree, tree);
+extern tree composite_pointer_type              (tree, tree, tree, tree,
+						       const char*);
+extern tree merge_types				(tree, tree);
+extern tree check_return_expr                   (tree);
 #define cp_build_binary_op(code, arg1, arg2) \
   build_binary_op(code, arg1, arg2, 1)
 #define cxx_sizeof(T)  cxx_sizeof_or_alignof_type (T, SIZEOF_EXPR, true)
@@ -4393,44 +4396,44 @@ extern tree check_return_expr                   PARAMS ((tree));
 extern tree build_ptrmemfunc_access_expr       (tree, tree);
 
 /* in typeck2.c */
-extern void require_complete_eh_spec_types	PARAMS ((tree, tree));
-extern void cxx_incomplete_type_diagnostic	PARAMS ((tree, tree, int));
+extern void require_complete_eh_spec_types	(tree, tree);
+extern void cxx_incomplete_type_diagnostic	(tree, tree, int);
 #undef cxx_incomplete_type_error
-extern void cxx_incomplete_type_error		PARAMS ((tree, tree));
+extern void cxx_incomplete_type_error		(tree, tree);
 #define cxx_incomplete_type_error(V,T) \
   (cxx_incomplete_type_diagnostic ((V), (T), 0))
-extern tree error_not_base_type			PARAMS ((tree, tree));
-extern tree binfo_or_else			PARAMS ((tree, tree));
-extern void readonly_error			PARAMS ((tree, const char *, int));
-extern int abstract_virtuals_error		PARAMS ((tree, tree));
-
-extern tree store_init_value			PARAMS ((tree, tree));
-extern tree digest_init				PARAMS ((tree, tree, tree *));
-extern tree build_scoped_ref			PARAMS ((tree, tree, tree *));
-extern tree build_x_arrow			PARAMS ((tree));
-extern tree build_m_component_ref		PARAMS ((tree, tree));
-extern tree build_functional_cast		PARAMS ((tree, tree));
-extern void check_for_new_type			PARAMS ((const char *, flagged_type_tree));
-extern tree add_exception_specifier             PARAMS ((tree, tree, int));
-extern tree merge_exception_specifiers          PARAMS ((tree, tree));
+extern tree error_not_base_type			(tree, tree);
+extern tree binfo_or_else			(tree, tree);
+extern void readonly_error			(tree, const char *, int);
+extern int abstract_virtuals_error		(tree, tree);
+
+extern tree store_init_value			(tree, tree);
+extern tree digest_init				(tree, tree, tree *);
+extern tree build_scoped_ref			(tree, tree, tree *);
+extern tree build_x_arrow			(tree);
+extern tree build_m_component_ref		(tree, tree);
+extern tree build_functional_cast		(tree, tree);
+extern void check_for_new_type			(const char *, flagged_type_tree);
+extern tree add_exception_specifier             (tree, tree, int);
+extern tree merge_exception_specifiers          (tree, tree);
 
 /* in mangle.c */
-extern void init_mangle                         PARAMS ((void));
-extern void mangle_decl                         PARAMS ((tree));
-extern const char *mangle_type_string           PARAMS ((tree));
-extern tree mangle_type                         PARAMS ((tree));
-extern tree mangle_typeinfo_for_type            PARAMS ((tree));
-extern tree mangle_typeinfo_string_for_type     PARAMS ((tree));
-extern tree mangle_vtbl_for_type                PARAMS ((tree));
-extern tree mangle_vtt_for_type                 PARAMS ((tree));
-extern tree mangle_ctor_vtbl_for_type           PARAMS ((tree, tree));
-extern tree mangle_thunk                        PARAMS ((tree, int, tree, tree));
-extern tree mangle_conv_op_name_for_type        PARAMS ((tree));
-extern tree mangle_guard_variable               PARAMS ((tree));
-extern tree mangle_ref_init_variable            PARAMS ((tree));
+extern void init_mangle                         (void);
+extern void mangle_decl                         (tree);
+extern const char *mangle_type_string           (tree);
+extern tree mangle_type                         (tree);
+extern tree mangle_typeinfo_for_type            (tree);
+extern tree mangle_typeinfo_string_for_type     (tree);
+extern tree mangle_vtbl_for_type                (tree);
+extern tree mangle_vtt_for_type                 (tree);
+extern tree mangle_ctor_vtbl_for_type           (tree, tree);
+extern tree mangle_thunk                        (tree, int, tree, tree);
+extern tree mangle_conv_op_name_for_type        (tree);
+extern tree mangle_guard_variable               (tree);
+extern tree mangle_ref_init_variable            (tree);
 
 /* in dump.c */
-extern int cp_dump_tree                         PARAMS ((void *, tree));
+extern int cp_dump_tree                         (void *, tree);
 
 /* -- end of C++ */