This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [janitor] Convert objc to ISO C90


Stan Shebs <shebs@apple.com> writes:

> Andreas Jaeger wrote:
>
>>The appended aptch converts the objc-act files to ISO C90 prototypes.
>>
>>Tested with bootstrap/regtesting (c+objc only) on x86_64-linux-gnu,
>>
>>Andreas
>>
>>2003-09-14  Andreas Jaeger  <aj@suse.de>
>>
>>	* objc/objc-act.c: Convert to ISO C90 prototypes.
>>	* objc/objc-act.h: Likewise.
>>
> The work is appreciated, but the timing is not so good - we were
> about ready to merge objc-improvements-branch into the trunk.
> Could I trouble you to apply this patch to that branch also? Thanks!

Let's make a deal: Here's a patch - can you test it and commit it if
it works?  I don't have the time right now to test it properly... I
don't expect problems but you never know.  If I should commit it
directly without testing myself (and you cleanup afterwards if
needed), that's fine with me also.

Andreas

2003-09-14  Andreas Jaeger  <aj@suse.de>

	* objc/objc-act.c: Convert to ISO C90 prototypes.
	* objc/objc-act.h: Likewise.

============================================================
Index: gcc/objc/objc-act.c
--- gcc/objc/objc-act.c	13 Sep 2003 02:19:46 -0000	1.179.2.12
+++ gcc/objc/objc-act.c	16 Sep 2003 07:49:11 -0000
@@ -117,80 +117,74 @@ char *util_firstobj;
 
 /* Used by compile_file.  */
 
-static void init_objc				PARAMS ((void));
-static void finish_objc				PARAMS ((void));
+static void init_objc (void);
+static void finish_objc (void);
 
 /* Code generation.  */
 
-static void synth_module_prologue		PARAMS ((void));
-static tree objc_build_constructor		PARAMS ((tree, tree));
-static rtx build_module_descriptor		PARAMS ((void));
-static tree init_module_descriptor		PARAMS ((tree));
-static tree build_objc_method_call		PARAMS ((int, tree, tree,
-						       tree, tree));
-static void generate_strings			PARAMS ((void));
-static tree get_proto_encoding 			PARAMS ((tree));
-static void build_selector_translation_table	PARAMS ((void));
-
-static tree objc_add_static_instance		PARAMS ((tree, tree));
-
-static void build_objc_exception_stuff		PARAMS ((void));
-static tree objc_declare_variable		PARAMS ((enum rid, tree, 
-						       tree, tree));
-static tree objc_enter_block			PARAMS ((void));
-static tree objc_exit_block			PARAMS ((void));
-static void objc_build_try_enter_fragment	PARAMS ((void));
-static void objc_build_try_exit_fragment	PARAMS ((void));
-static void objc_build_extract_fragment		PARAMS ((void));
-static tree objc_build_extract_expr		PARAMS ((void));
-
-static tree build_ivar_template			PARAMS ((void));
-static tree build_method_template		PARAMS ((void));
-static tree build_private_template		PARAMS ((tree));
-static void build_class_template		PARAMS ((void));
-static void build_selector_template		PARAMS ((void));
-static void build_category_template		PARAMS ((void));
-static tree lookup_method_in_hash_lists		PARAMS ((tree));
-static void build_super_template		PARAMS ((void));
-static tree build_category_initializer		PARAMS ((tree, tree, tree,
-						       tree, tree, tree));
-static tree build_protocol_initializer		PARAMS ((tree, tree, tree,
-						       tree, tree));
-static void synth_forward_declarations		PARAMS ((void));
-static int ivar_list_length			PARAMS ((tree));
-static tree get_class_ivars			PARAMS ((tree, int));
-static void generate_ivar_lists			PARAMS ((void));
-static void generate_dispatch_tables		PARAMS ((void));
-static void generate_shared_structures		PARAMS ((void));
-static tree generate_protocol_list		PARAMS ((tree));
-static void generate_forward_declaration_to_string_table PARAMS ((void));
-static void build_protocol_reference		PARAMS ((tree));
-
-static tree build_keyword_selector		PARAMS ((tree));
-static tree synth_id_with_class_suffix		PARAMS ((const char *, tree));
-
-static void generate_static_references		PARAMS ((void));
-static int check_methods_accessible		PARAMS ((tree, tree,
-						       int));
-static void encode_aggregate_within		PARAMS ((tree, int, int,
-					               int, int));
-static const char *objc_demangle		PARAMS ((const char *));
-static void objc_expand_function_end            PARAMS ((void));
+static void synth_module_prologue (void);
+static tree objc_build_constructor (tree, tree);
+static rtx build_module_descriptor (void);
+static tree init_module_descriptor (tree);
+static tree build_objc_method_call (int, tree, tree, tree, tree);
+static void generate_strings (void);
+static tree get_proto_encoding (tree);
+static void build_selector_translation_table (void);
+
+static tree objc_add_static_instance (tree, tree);
+
+static void build_objc_exception_stuff (void);
+static tree objc_declare_variable (enum rid, tree, tree, tree);
+static tree objc_enter_block (void);
+static tree objc_exit_block (void);
+static void objc_build_try_enter_fragment (void);
+static void objc_build_try_exit_fragment (void);
+static void objc_build_extract_fragment (void);
+static tree objc_build_extract_expr (void);
+
+static tree build_ivar_template (void);
+static tree build_method_template (void);
+static tree build_private_template (tree);
+static void build_class_template (void);
+static void build_selector_template (void);
+static void build_category_template (void);
+static tree lookup_method_in_hash_lists (tree);
+static void build_super_template (void);
+static tree build_category_initializer (tree, tree, tree, tree, tree, tree);
+static tree build_protocol_initializer (tree, tree, tree, tree, tree);
+static void synth_forward_declarations (void);
+static int ivar_list_length (tree);
+static tree get_class_ivars (tree, int);
+static void generate_ivar_lists (void);
+static void generate_dispatch_tables (void);
+static void generate_shared_structures (void);
+static tree generate_protocol_list (tree);
+static void generate_forward_declaration_to_string_table (void);
+static void build_protocol_reference (tree);
+
+static tree build_keyword_selector (tree);
+static tree synth_id_with_class_suffix (const char *, tree);
+
+static void generate_static_references (void);
+static int check_methods_accessible (tree, tree, int);
+static void encode_aggregate_within (tree, int, int, int, int);
+static const char *objc_demangle (const char *);
+static void objc_expand_function_end (void);
 
 /* Hash tables to manage the global pool of method prototypes.  */
 
 hash *nst_method_hash_list = 0;
 hash *cls_method_hash_list = 0;
 
-static size_t hash_func				PARAMS ((tree));
-static void hash_init				PARAMS ((void));
-static void hash_enter				PARAMS ((hash *, tree));
-static hash hash_lookup				PARAMS ((hash *, tree));
-static void hash_add_attr			PARAMS ((hash, tree));
-static tree lookup_method			PARAMS ((tree, tree));
-static tree lookup_method_static		PARAMS ((tree, tree, int));
-static tree add_class				PARAMS ((tree));
-static void add_category			PARAMS ((tree, tree));
+static size_t hash_func (tree);
+static void hash_init (void);
+static void hash_enter (hash *, tree);
+static hash hash_lookup (hash *, tree);
+static void hash_add_attr (hash, tree);
+static tree lookup_method (tree, tree);
+static tree lookup_method_static (tree, tree, int);
+static tree add_class (tree);
+static void add_category (tree, tree);
 
 enum string_section
 {
@@ -199,114 +193,104 @@ enum string_section
   meth_var_types	/* method and variable type descriptors */
 };
 
-static tree add_objc_string			PARAMS ((tree,
-						       enum string_section));
-static tree get_objc_string_decl		PARAMS ((tree,
-						       enum string_section));
-static tree build_objc_string_decl		PARAMS ((enum string_section));
-static tree build_selector_reference_decl	PARAMS ((void));
+static tree add_objc_string (tree, enum string_section);
+static tree get_objc_string_decl (tree, enum string_section);
+static tree build_objc_string_decl (enum string_section);
+static tree build_selector_reference_decl (void);
 
 /* Protocol additions.  */
 
-static tree add_protocol			PARAMS ((tree));
-static tree lookup_protocol			PARAMS ((tree));
-static void check_protocol_recursively		PARAMS ((tree, tree));
-static tree lookup_and_install_protocols	PARAMS ((tree));
+static tree add_protocol (tree);
+static tree lookup_protocol (tree);
+static void check_protocol_recursively (tree, tree);
+static tree lookup_and_install_protocols (tree);
 
 /* Type encoding.  */
 
-static void encode_type_qualifiers		PARAMS ((tree));
-static void encode_pointer			PARAMS ((tree, int, int));
-static void encode_array			PARAMS ((tree, int, int));
-static void encode_aggregate			PARAMS ((tree, int, int));
-static void encode_next_bitfield		PARAMS ((int));
-static void encode_gnu_bitfield			PARAMS ((int, tree, int));
-static void encode_type				PARAMS ((tree, int, int));
-static void encode_field_decl			PARAMS ((tree, int, int));
-
-static void really_start_method			PARAMS ((tree, tree));
-static int comp_method_with_proto		PARAMS ((tree, tree));
-static int objc_types_are_equivalent		PARAMS ((tree, tree));
-static int comp_proto_with_proto		PARAMS ((tree, tree));
-static tree get_arg_type_list			PARAMS ((tree, int, int));
-static tree objc_expr_last			PARAMS ((tree));
-static void synth_self_and_ucmd_args		PARAMS ((void));
+static void encode_type_qualifiers (tree);
+static void encode_pointer (tree, int, int);
+static void encode_array (tree, int, int);
+static void encode_aggregate (tree, int, int);
+static void encode_next_bitfield (int);
+static void encode_gnu_bitfield (int, tree, int);
+static void encode_type (tree, int, int);
+static void encode_field_decl (tree, int, int);
+
+static void really_start_method (tree, tree);
+static int comp_method_with_proto (tree, tree);
+static int objc_types_are_equivalent (tree, tree);
+static int comp_proto_with_proto (tree, tree);
+static tree get_arg_type_list (tree, int, int);
+static tree objc_expr_last (tree);
+static void synth_self_and_ucmd_args (void);
 
 /* Utilities for debugging and error diagnostics.  */
 
-static void warn_with_method			PARAMS ((const char *, int, tree));
-static void error_with_ivar			PARAMS ((const char *, tree, tree));
-static char *gen_method_decl			PARAMS ((tree, char *));
-static char *gen_declaration			PARAMS ((tree, char *));
-static void gen_declaration_1			PARAMS ((tree, char *));
-static char *gen_declarator			PARAMS ((tree, char *,
-						       const char *));
-static int is_complex_decl			PARAMS ((tree));
-static void adorn_decl				PARAMS ((tree, char *));
-static void dump_interface			PARAMS ((FILE *, tree));
+static void warn_with_method (const char *, int, tree);
+static void error_with_ivar (const char *, tree, tree);
+static char *gen_method_decl (tree, char *);
+static char *gen_declaration (tree, char *);
+static void gen_declaration_1 (tree, char *);
+static char *gen_declarator (tree, char *, const char *);
+static int is_complex_decl (tree);
+static void adorn_decl (tree, char *);
+static void dump_interface (FILE *, tree);
 
 /* Everything else.  */
 
-static tree define_decl				PARAMS ((tree, tree));
-static tree lookup_method_in_protocol_list	PARAMS ((tree, tree, int));
-static tree lookup_protocol_in_reflist		PARAMS ((tree, tree));
-static tree create_builtin_decl			PARAMS ((enum tree_code,
-						       tree, const char *));
-static void setup_string_decl			PARAMS ((void));
-static int check_string_class_template		PARAMS ((void));
-static tree my_build_string			PARAMS ((int, const char *));
-static void build_objc_symtab_template		PARAMS ((void));
-static tree init_def_list			PARAMS ((tree));
-static tree init_objc_symtab			PARAMS ((tree));
-static tree build_metadata_decl			PARAMS ((const char *, tree));
-static void forward_declare_categories		PARAMS ((void));
-static void generate_objc_symtab_decl		PARAMS ((void));
-static tree build_selector			PARAMS ((tree));
-static tree build_typed_selector_reference     	PARAMS ((tree, tree));
-static tree build_selector_reference		PARAMS ((tree));
-static tree build_class_reference_decl		PARAMS ((void));
-static void add_class_reference			PARAMS ((tree));
-static tree build_protocol_template		PARAMS ((void));
-static tree build_descriptor_table_initializer	PARAMS ((tree, tree));
-static tree build_method_prototype_list_template PARAMS ((tree, int));
-static tree build_method_prototype_template	PARAMS ((void));
-static tree objc_method_parm_type		PARAMS ((tree));
-static int objc_encoded_type_size		PARAMS ((tree));
-static tree encode_method_prototype		PARAMS ((tree));
-static tree generate_descriptor_table		PARAMS ((tree, const char *,
-						       int, tree, tree));
-static void generate_method_descriptors		PARAMS ((tree));
-static void generate_protocol_references	PARAMS ((tree));
-static void generate_protocols			PARAMS ((void));
-static void check_ivars				PARAMS ((tree, tree));
-static tree build_ivar_list_template		PARAMS ((tree, int));
-static tree build_method_list_template		PARAMS ((tree, int));
-static tree build_ivar_list_initializer		PARAMS ((tree, tree));
-static tree generate_ivars_list			PARAMS ((tree, const char *,
-						       int, tree));
-static tree build_dispatch_table_initializer	PARAMS ((tree, tree));
-static tree generate_dispatch_table		PARAMS ((tree, const char *,
-						       int, tree));
-static tree build_shared_structure_initializer	PARAMS ((tree, tree, tree, tree,
-						       tree, int, tree, tree,
-						       tree));
-static void generate_category			PARAMS ((tree));
-static int is_objc_type_qualifier		PARAMS ((tree));
-static tree adjust_type_for_id_default		PARAMS ((tree));
-static tree check_duplicates			PARAMS ((hash, int));
-static tree receiver_is_class_object		PARAMS ((tree, int, int));
-static int check_methods			PARAMS ((tree, tree, int));
-static int conforms_to_protocol			PARAMS ((tree, tree));
-static void check_protocol			PARAMS ((tree, const char *,
-						       const char *));
-static void check_protocols			PARAMS ((tree, const char *,
-						       const char *));
-static void gen_declspecs			PARAMS ((tree, char *, int));
-static void generate_classref_translation_entry	PARAMS ((tree));
-static void handle_class_ref			PARAMS ((tree));
-static void generate_struct_by_value_array	PARAMS ((void))
+static tree define_decl (tree, tree);
+static tree lookup_method_in_protocol_list (tree, tree, int);
+static tree lookup_protocol_in_reflist (tree, tree);
+static tree create_builtin_decl (enum tree_code, tree, const char *);
+static void setup_string_decl (void);
+static int check_string_class_template (void);
+static tree my_build_string (int, const char *);
+static void build_objc_symtab_template (void);
+static tree init_def_list (tree);
+static tree init_objc_symtab (tree);
+static tree build_metadata_decl (const char *, tree);
+static void forward_declare_categories (void);
+static void generate_objc_symtab_decl (void);
+static tree build_selector (tree);
+static tree build_typed_selector_reference (tree, tree);
+static tree build_selector_reference (tree);
+static tree build_class_reference_decl (void);
+static void add_class_reference (tree);
+static tree build_protocol_template (void);
+static tree build_descriptor_table_initializer (tree, tree);
+static tree build_method_prototype_list_template (tree, int);
+static tree build_method_prototype_template (void);
+static tree objc_method_parm_type (tree);
+static int objc_encoded_type_size (tree);
+static tree encode_method_prototype (tree);
+static tree generate_descriptor_table (tree, const char *, int, tree, tree);
+static void generate_method_descriptors (tree);
+static void generate_protocol_references (tree);
+static void generate_protocols (void);
+static void check_ivars (tree, tree);
+static tree build_ivar_list_template (tree, int);
+static tree build_method_list_template (tree, int);
+static tree build_ivar_list_initializer (tree, tree);
+static tree generate_ivars_list (tree, const char *, int, tree);
+static tree build_dispatch_table_initializer (tree, tree);
+static tree generate_dispatch_table (tree, const char *, int, tree);
+static tree build_shared_structure_initializer (tree, tree, tree, tree,
+						tree, int, tree, tree, tree);
+static void generate_category (tree);
+static int is_objc_type_qualifier (tree);
+static tree adjust_type_for_id_default (tree);
+static tree check_duplicates (hash, int);
+static tree receiver_is_class_object (tree, int, int);
+static int check_methods (tree, tree, int);
+static int conforms_to_protocol (tree, tree);
+static void check_protocol (tree, const char *, const char *);
+static void check_protocols (tree, const char *, const char *);
+static void gen_declspecs (tree, char *, int);
+static void generate_classref_translation_entry (tree);
+static void handle_class_ref (tree);
+static void generate_struct_by_value_array (void)
      ATTRIBUTE_NORETURN;
-static void mark_referenced_methods		PARAMS ((void));
+static void mark_referenced_methods (void);
 
 /*** Private Interface (data) ***/
 
@@ -391,15 +375,15 @@ struct val_stack {
 static struct val_stack *catch_count_stack, *exc_binding_stack;
 static int if_nesting_count, blk_nesting_count; /* useful for debugging */
 
-static void val_stack_push		PARAMS ((struct val_stack **, long));
-static void val_stack_pop		PARAMS ((struct val_stack **));
+static void val_stack_push (struct val_stack **, long);
+static void val_stack_pop (struct val_stack **);
 
 /* The OCTI_... enumeration itself is in objc/objc-act.h.  */
 tree objc_global_trees[OCTI_MAX];
 
-static void generate_objc_image_info		PARAMS ((void));
+static void generate_objc_image_info (void);
 
-static void handle_impent			PARAMS ((struct imp_entry *));
+static void handle_impent (struct imp_entry *);
 
 struct imp_entry *imp_list = 0;
 int imp_count = 0;	/* `@implementation' */
@@ -435,7 +419,7 @@ static int generating_instance_variables
    the transition point between the two possibilities.  */
 
 static void
-generate_struct_by_value_array ()
+generate_struct_by_value_array (void)
 {
   tree type;
   tree field_decl, field_decl_chain;
@@ -494,7 +478,7 @@ generate_struct_by_value_array ()
 }
 
 bool
-objc_init ()
+objc_init (void)
 {
   if (c_objc_common_init () == false)
     return false;
@@ -549,7 +533,7 @@ objc_init ()
 }
 
 void
-finish_file ()
+finish_file (void)
 {
   mark_referenced_methods ();
   c_objc_common_finish_file ();
@@ -564,9 +548,7 @@ finish_file ()
 }

 static tree
-define_decl (declarator, declspecs)
-     tree declarator;
-     tree declspecs;
+define_decl (tree declarator, tree declspecs)
 {
   tree decl = start_decl (declarator, declspecs, 0, NULL_TREE);
   finish_decl (decl, NULL_TREE, NULL_TREE);
@@ -574,10 +556,8 @@ define_decl (declarator, declspecs)
 }
 
 static tree
-lookup_method_in_protocol_list (rproto_list, sel_name, class_meth)
-   tree rproto_list;
-   tree sel_name;
-   int class_meth;
+lookup_method_in_protocol_list (tree rproto_list, tree sel_name,
+				int class_meth)
 {
    tree rproto, p;
    tree fnd = 0;
@@ -609,9 +589,7 @@ lookup_method_in_protocol_list (rproto_l
 }
 
 static tree
-lookup_protocol_in_reflist (rproto_list, lproto)
-     tree rproto_list;
-     tree lproto;
+lookup_protocol_in_reflist (tree rproto_list, tree lproto)
 {
   tree rproto, p;
 
@@ -664,10 +642,7 @@ lookup_protocol_in_reflist (rproto_list,
 */
 
 int
-objc_comptypes (lhs, rhs, reflexive)
-     tree lhs;
-     tree rhs;
-     int reflexive;
+objc_comptypes (tree lhs, tree rhs, int reflexive)
 {
   /* New clause for protocols.  */
 
@@ -960,8 +935,7 @@ objc_comptypes (lhs, rhs, reflexive)
 /* Called from finish_decl.  */
 
 void
-objc_check_decl (decl)
-     tree decl;
+objc_check_decl (tree decl)
 {
   tree type = TREE_TYPE (decl);
 
@@ -976,9 +950,7 @@ objc_check_decl (decl)
 /* Implement static typing.  At this point, we know we have an interface.  */
 
 tree
-get_static_reference (interface, protocols)
-     tree interface;
-     tree protocols;
+get_static_reference (tree interface, tree protocols)
 {
   tree type = xref_tag (RECORD_TYPE, interface);
 
@@ -1009,8 +981,7 @@ get_static_reference (interface, protoco
 }
 
 tree
-get_object_reference (protocols)
-     tree protocols;
+get_object_reference (tree protocols)
 {
   tree type_decl = lookup_name (objc_id_id);
   tree type;
@@ -1061,9 +1032,7 @@ get_object_reference (protocols)
    conforms to.  */
 
 static void 
-check_protocol_recursively (proto, list)
-     tree proto;
-     tree list;
+check_protocol_recursively (tree proto, tree list)
 {
   tree p;
 
@@ -1083,8 +1052,7 @@ check_protocol_recursively (proto, list)
 }
 
 static tree
-lookup_and_install_protocols (protocols)
-     tree protocols;
+lookup_and_install_protocols (tree protocols)
 {
   tree proto;
   tree prev = NULL;
@@ -1117,10 +1085,7 @@ lookup_and_install_protocols (protocols)
    TYPE is its data type.  */
 
 static tree
-create_builtin_decl (code, type, name)
-     enum tree_code code;
-     tree type;
-     const char *name;
+create_builtin_decl (enum tree_code code, tree type, const char *name)
 {
   tree decl = build_decl (code, get_identifier (name), type);
 
@@ -1138,7 +1103,7 @@ create_builtin_decl (code, type, name)
 /* Find the decl for the constant string class.  */
 
 static void
-setup_string_decl ()
+setup_string_decl (void)
 {
   if (!string_class_decl)
     {
@@ -1170,7 +1135,7 @@ setup_string_decl ()
  	identifier_node    identifier_node  */
 
 static void
-synth_module_prologue ()
+synth_module_prologue (void)
 {
   tree temp_type;
 
@@ -1381,7 +1346,7 @@ synth_module_prologue ()
    }; */
 
 static int
-check_string_class_template ()
+check_string_class_template (void)
 {
   tree field_decl = TYPE_FIELDS (constant_string_type);
 
@@ -1409,9 +1374,7 @@ static GTY(()) int string_layout_checked
 /* Custom build_string which sets TREE_TYPE!  */
 
 static tree
-my_build_string (len, str)
-     int len;
-     const char *str;
+my_build_string (int len, const char *str)
 {
   return fix_string_type (build_string (len, str));
 }
@@ -1500,8 +1463,7 @@ build_objc_string_object (tree string)
 
 static GTY(()) int num_static_inst;
 static tree
-objc_add_static_instance (constructor, class_decl)
-     tree constructor, class_decl;
+objc_add_static_instance (tree constructor, tree class_decl)
 {
   tree *chain, decl;
   char buf[256];
@@ -1540,8 +1502,7 @@ objc_add_static_instance (constructor, c
    with type TYPE and elements ELTS.  */
 
 static tree
-objc_build_constructor (type, elts)
-     tree type, elts;
+objc_build_constructor (tree type, tree elts)
 {
   tree constructor, f, e;
 
@@ -1590,7 +1551,7 @@ objc_build_constructor (type, elts)
    }; */
 
 static void
-build_objc_symtab_template ()
+build_objc_symtab_template (void)
 {
   tree field_decl, field_decl_chain;
 
@@ -1647,8 +1608,7 @@ build_objc_symtab_template ()
    This is a CONSTRUCTOR.  */
 
 static tree
-init_def_list (type)
-     tree type;
+init_def_list (tree type)
 {
   tree expr, initlist = NULL_TREE;
   struct imp_entry *impent;
@@ -1692,8 +1652,7 @@ init_def_list (type)
 /* Construct the initial value for all of _objc_symtab.  */
 
 static tree
-init_objc_symtab (type)
-     tree type;
+init_objc_symtab (tree type)
 {
   tree initlist;
 
@@ -1737,9 +1696,7 @@ init_objc_symtab (type)
 /* Generate forward declarations for metadata such as 
   'OBJC_CLASS_...'.  */
 static tree
-build_metadata_decl (name, type)
-     const char *name; 
-     tree type;
+build_metadata_decl (const char *name, tree type)
 {
   tree decl, decl_specs;
   /* extern struct TYPE NAME_<name>; */
@@ -1759,7 +1716,7 @@ build_metadata_decl (name, type)
    init_def_list can use them in a CONSTRUCTOR.  */
 
 static void
-forward_declare_categories ()
+forward_declare_categories (void)
 {
   struct imp_entry *impent;
   tree sav = objc_implementation_context;
@@ -1782,7 +1739,7 @@ forward_declare_categories ()
    and initialized appropriately.  */
 
 static void
-generate_objc_symtab_decl ()
+generate_objc_symtab_decl (void)
 {
   tree sc_spec;
 
@@ -1813,8 +1770,7 @@ generate_objc_symtab_decl ()
 }

 static tree
-init_module_descriptor (type)
-     tree type;
+init_module_descriptor (tree type)
 {
   tree initlist, expr;
 
@@ -1852,7 +1808,7 @@ init_module_descriptor (type)
    struct objc_module { ... } _OBJC_MODULE = { ... };   */
 
 static rtx
-build_module_descriptor ()
+build_module_descriptor (void)
 {
   tree decl_specs, field_decl, field_decl_chain;
 
@@ -1974,7 +1930,7 @@ build_module_descriptor ()
 /* extern const char _OBJC_STRINGS[]; */
 
 static void
-generate_forward_declaration_to_string_table ()
+generate_forward_declaration_to_string_table (void)
 {
   tree sc_spec, decl_specs, expr_decl;
 
@@ -1990,9 +1946,7 @@ generate_forward_declaration_to_string_t
 /* Return the DECL of the string IDENT in the SECTION.  */
 
 static tree
-get_objc_string_decl (ident, section)
-     tree ident;
-     enum string_section section;
+get_objc_string_decl (tree ident, enum string_section section)
 {
   tree chain;
 
@@ -2017,7 +1971,7 @@ get_objc_string_decl (ident, section)
    for the array built.  */
 
 static void
-generate_static_references ()
+generate_static_references (void)
 {
   tree decls = NULL_TREE, ident, decl_spec, expr_decl, expr = NULL_TREE;
   tree class_name, class, decl, initlist;
@@ -2093,7 +2047,7 @@ generate_static_references ()
 /* Output all strings.  */
 
 static void
-generate_strings ()
+generate_strings (void)
 {
   tree sc_spec, decl_specs, expr_decl;
   tree chain, string_expr;
@@ -2147,7 +2101,7 @@ generate_strings ()
 
 static GTY(()) int selector_reference_idx;
 static tree
-build_selector_reference_decl ()
+build_selector_reference_decl (void)
 {
   tree decl, ident;
   char buf[256];
@@ -2172,8 +2126,7 @@ build_selector_reference_decl ()
 /* Just a handy wrapper for add_objc_string.  */
 
 static tree
-build_selector (ident)
-     tree ident;
+build_selector (tree ident)
 {
   tree expr = add_objc_string (ident, meth_var_names);
   if (flag_typed_selectors)
@@ -2183,7 +2136,7 @@ build_selector (ident)
 }
 
 static void
-build_selector_translation_table ()
+build_selector_translation_table (void)
 {
   tree sc_spec, decl_specs;
   tree chain, initlist = NULL_TREE;
@@ -2275,8 +2228,7 @@ build_selector_translation_table ()
 }
 
 static tree
-get_proto_encoding (proto)
-     tree proto;
+get_proto_encoding (tree proto)
 {
   tree encoding;
   if (proto)
@@ -2299,8 +2251,7 @@ get_proto_encoding (proto)
    identifier_node that represent the selector.  */
 
 static tree
-build_typed_selector_reference (ident, prototype)
-     tree ident, prototype;
+build_typed_selector_reference (tree ident, tree prototype)
 {
   tree *chain = &sel_ref_chain;
   tree expr;
@@ -2326,8 +2277,7 @@ build_typed_selector_reference (ident, p
 }
 
 static tree
-build_selector_reference (ident)
-     tree ident;
+build_selector_reference (tree ident)
 {
   tree *chain = &sel_ref_chain;
   tree expr;
@@ -2357,7 +2307,7 @@ build_selector_reference (ident)
 
 static GTY(()) int class_reference_idx;
 static tree
-build_class_reference_decl ()
+build_class_reference_decl (void)
 {
   tree decl, ident;
   char buf[256];
@@ -2383,8 +2333,7 @@ build_class_reference_decl ()
    it.  */
 
 static void
-add_class_reference (ident)
-     tree ident;
+add_class_reference (tree ident)
 {
   tree chain;
 
@@ -2412,8 +2361,7 @@ add_class_reference (ident)
    reference variable.  */
 
 tree
-get_class_reference (ident)
-     tree ident;
+get_class_reference (tree ident)
 {
   tree orig_ident;
   
@@ -2470,9 +2418,7 @@ get_class_reference (ident)
    to decls for the strings.  */
 
 static tree
-add_objc_string (ident, section)
-     tree ident;
-     enum string_section section;
+add_objc_string (tree ident, enum string_section section)
 {
   tree *chain, decl;
 
@@ -2505,8 +2451,7 @@ static GTY(()) int meth_var_names_idx;
 static GTY(()) int meth_var_types_idx;
 
 static tree
-build_objc_string_decl (section)
-     enum string_section section;
+build_objc_string_decl (enum string_section section)
 {
   tree decl, ident;
   char buf[256];
@@ -2536,9 +2481,7 @@ build_objc_string_decl (section)
 
 
 void
-objc_declare_alias (alias_ident, class_ident)
-     tree alias_ident;
-     tree class_ident;
+objc_declare_alias (tree alias_ident, tree class_ident)
 {
   tree underlying_class;
 
@@ -2557,8 +2500,7 @@ objc_declare_alias (alias_ident, class_i
 }
 
 void
-objc_declare_class (ident_list)
-     tree ident_list;
+objc_declare_class (tree ident_list)
 {
   tree list;
 #ifdef OBJCPLUS
@@ -2591,8 +2533,7 @@ objc_declare_class (ident_list)
 }
 
 tree
-is_class_name (ident)
-     tree ident;
+is_class_name (tree ident)
 {
   tree chain;
 
@@ -2634,8 +2575,7 @@ is_class_name (ident)
    handle ObjC types gracefully.  */
 
 tree
-objc_is_object_ptr (type)
-     tree type;
+objc_is_object_ptr (tree type)
 {
   type = TYPE_MAIN_VARIANT (type);
   if (!type || TREE_CODE (type) != POINTER_TYPE)
@@ -2650,8 +2590,7 @@ objc_is_object_ptr (type)
 }
 
 tree
-lookup_interface (ident)
-     tree ident;
+lookup_interface (tree ident)
 {
   tree chain;
 
@@ -2669,8 +2608,7 @@ lookup_interface (ident)
 
 /* Implement @defs (<classname>) within struct bodies.  */
 tree
-get_class_ivars_from_name (class_name)
-     tree class_name;
+get_class_ivars_from_name (tree class_name)
 {
   tree interface = lookup_interface (class_name);
   tree field, fields = NULL_TREE;
@@ -2703,9 +2641,7 @@ get_class_ivars_from_name (class_name)
    and for @defs constructs.  */
 
 static tree
-get_class_ivars (interface, raw)
-     tree interface;
-     int raw;
+get_class_ivars (tree interface, int raw)
 {
   tree my_name, super_name, ivar_chain;
 
@@ -2759,7 +2695,7 @@ get_class_ivars (interface, raw)
 }
 
 static tree
-objc_enter_block ()
+objc_enter_block (void)
 {
   tree block;
   
@@ -2780,7 +2716,7 @@ objc_enter_block ()
 }
 
 static tree
-objc_exit_block ()
+objc_exit_block (void)
 {
   tree block = TREE_VALUE (objc_exception_block_stack);
 #ifndef OBJCPLUS
@@ -2807,9 +2743,7 @@ objc_exit_block ()
 }
   
 static tree
-objc_declare_variable (scspec, name, type, init)
-     enum rid scspec;
-     tree name, type, init;
+objc_declare_variable (enum rid scspec, tree name, tree type, tree init)
 {
   tree decl;
   
@@ -2825,8 +2759,7 @@ objc_declare_variable (scspec, name, typ
 }
 
 tree 
-objc_build_throw_stmt (throw_expr)
-     tree throw_expr;
+objc_build_throw_stmt (tree throw_expr)
 {
   tree func_params;
   
@@ -2850,9 +2783,7 @@ objc_build_throw_stmt (throw_expr)
 }
 
 static void
-val_stack_push (nc, val)
-     struct val_stack **nc;
-     long val;
+val_stack_push (struct val_stack **nc, long val)
 {
   struct val_stack *new_elem = xmalloc (sizeof (struct val_stack));
   new_elem->val = val;
@@ -2861,8 +2792,7 @@ val_stack_push (nc, val)
 }
 
 static void
-val_stack_pop (nc)
-     struct val_stack **nc;
+val_stack_pop (struct val_stack **nc)
 {     
   struct val_stack *old_elem = *nc;
   *nc = old_elem->next;
@@ -2870,7 +2800,7 @@ val_stack_pop (nc)
 }
 
 static void
-objc_build_try_enter_fragment ()
+objc_build_try_enter_fragment (void)
 {
 	/*	objc_exception_try_enter(&_stackExceptionData);
 		if (!_setjmp(&_stackExceptionData.buf)) { */
@@ -2905,7 +2835,7 @@ objc_build_try_enter_fragment ()
 }
 
 static tree
-objc_build_extract_expr ()
+objc_build_extract_expr (void)
 {
 	/*	... = objc_exception_extract(&_stackExceptionData);  */
 
@@ -2918,7 +2848,7 @@ objc_build_extract_expr ()
 }
 
 static void
-objc_build_try_exit_fragment ()
+objc_build_try_exit_fragment (void)
 {
 	/* 	objc_exception_try_exit(&_stackExceptionData); */
 
@@ -2932,7 +2862,7 @@ objc_build_try_exit_fragment ()
 }
 
 static void
-objc_build_extract_fragment ()
+objc_build_extract_fragment (void)
 {
 	/*
              }
@@ -2957,7 +2887,7 @@ objc_build_extract_fragment ()
 }
 
 tree 
-objc_build_try_prologue ()
+objc_build_try_prologue (void)
 {
 
     /*	{ // new scope
@@ -2996,8 +2926,7 @@ objc_build_try_prologue ()
 }
 
 void 
-objc_build_try_epilogue (also_catch_prologue)
-     int also_catch_prologue;
+objc_build_try_epilogue (int also_catch_prologue)
 {
 
   if (also_catch_prologue) {
@@ -3048,8 +2977,7 @@ objc_build_try_epilogue (also_catch_prol
 }
 
 void 
-objc_build_catch_stmt (catch_expr)
-     tree catch_expr;
+objc_build_catch_stmt (tree catch_expr)
 {
       /* 	} else if (objc_exception_match(objc_get_class("SomeClass"), _caughtException)) {
 			register SomeClass *e = _caughtException;
@@ -3127,7 +3055,7 @@ objc_build_catch_stmt (catch_expr)
 }
 
 void 
-objc_build_catch_epilogue ()
+objc_build_catch_epilogue (void)
 {
   /* 
 			   }
@@ -3177,7 +3105,7 @@ objc_build_catch_epilogue ()
 }
 
 tree 
-objc_build_finally_prologue ()
+objc_build_finally_prologue (void)
 {
 	/* { // begin FINALLY scope 
                   if(!_rethrowException) { 
@@ -3204,7 +3132,7 @@ objc_build_finally_prologue ()
 }
 
 tree 
-objc_build_finally_epilogue ()
+objc_build_finally_epilogue (void)
 {
 
        /*         if(_rethrowException) { 
@@ -3234,8 +3162,7 @@ objc_build_finally_epilogue ()
 }
 
 tree 
-objc_build_try_catch_finally_stmt (has_catch, has_finally)
-     int has_catch, has_finally;
+objc_build_try_catch_finally_stmt (int has_catch, int has_finally)
 {
   /* NB: The operative assumption here is that TRY_FINALLY_EXPR will
      deal with all exits from 'try_catch_blk' and route them through
@@ -3278,8 +3205,7 @@ objc_build_try_catch_finally_stmt (has_c
 }
 
 void 
-objc_build_synchronized_prologue (sync_expr)
-     tree sync_expr;
+objc_build_synchronized_prologue (tree sync_expr)
 {
   /* 	{
 		id _eval_once = <sync_expr>;
@@ -3309,7 +3235,7 @@ objc_build_synchronized_prologue (sync_e
 }
      
 tree 
-objc_build_synchronized_epilogue ()
+objc_build_synchronized_epilogue (void)
 {
   /* 		}
 		@finally {
@@ -3354,7 +3280,7 @@ objc_build_synchronized_epilogue ()
 #endif
   
 static void
-build_objc_exception_stuff ()
+build_objc_exception_stuff (void)
 {
   tree field_decl, field_decl_chain, index, temp_type;
 
@@ -3442,8 +3368,7 @@ build_objc_exception_stuff ()
    };  */
 
 static tree
-build_private_template (class)
-     tree class;
+build_private_template (tree class)
 {
   tree ivar_context;
 
@@ -3484,7 +3409,7 @@ build_private_template (class)
    };  */
 
 static tree
-build_protocol_template ()
+build_protocol_template (void)
 {
   tree decl_specs, field_decl, field_decl_chain;
   tree template;
@@ -3542,9 +3467,7 @@ build_protocol_template ()
 }
 
 static tree
-build_descriptor_table_initializer (type, entries)
-     tree type;
-     tree entries;
+build_descriptor_table_initializer (tree type, tree entries)
 {
   tree initlist = NULL_TREE;
 
@@ -3583,9 +3506,7 @@ build_descriptor_table_initializer (type
    };  */
 
 static tree
-build_method_prototype_list_template (list_type, size)
-     tree list_type;
-     int size;
+build_method_prototype_list_template (tree list_type, int size)
 {
   tree objc_ivar_list_record;
   tree decl_specs, field_decl, field_decl_chain;
@@ -3615,7 +3536,7 @@ build_method_prototype_list_template (li
 }
 
 static tree
-build_method_prototype_template ()
+build_method_prototype_template (void)
 {
   tree proto_record;
   tree decl_specs, field_decl, field_decl_chain;
@@ -3642,8 +3563,7 @@ build_method_prototype_template ()
 }
 
 static tree 
-objc_method_parm_type (type)
-      tree type;
+objc_method_parm_type (tree type)
 {
   type = groktypename (TREE_TYPE (type));
   if (TREE_CODE (type) == TYPE_DECL)
@@ -3652,8 +3572,7 @@ objc_method_parm_type (type)
 }
 
 static int
-objc_encoded_type_size (type)
-      tree type;
+objc_encoded_type_size (tree type)
 {
   int sz = int_size_in_bytes (type);
 
@@ -3671,8 +3590,7 @@ objc_encoded_type_size (type)
 }
 
 static tree
-encode_method_prototype (method_decl)
-      tree method_decl;
+encode_method_prototype (tree method_decl)
 {
   tree parms;
   int parm_offset, i;
@@ -3742,12 +3660,8 @@ encode_method_prototype (method_decl)
 }
 
 static tree
-generate_descriptor_table (type, name, size, list, proto)
-     tree type;
-     const char *name;
-     int size;
-     tree list;
-     tree proto;
+generate_descriptor_table (tree type, const char *name, int size, tree list,
+			   tree proto)
 {
   tree sc_spec, decl_specs, decl, initlist;
 
@@ -3768,8 +3682,7 @@ generate_descriptor_table (type, name, s
 }
 
 static void
-generate_method_descriptors (protocol)
-     tree protocol;
+generate_method_descriptors (tree protocol)
 {
   tree initlist, chain, method_list_template;
   tree cast, variable_length_type;
@@ -3828,8 +3741,7 @@ generate_method_descriptors (protocol)
 }
 
 static void
-generate_protocol_references (plist)
-     tree plist;
+generate_protocol_references (tree plist)
 {
   tree lproto;
 
@@ -3888,7 +3800,7 @@ generate_protocol_references (plist)
    and end up being fixed up multiple times at runtime inizialization.
    But that doesn't hurt, it's just a little inefficient.  */
 static void
-generate_protocols ()
+generate_protocols (void)
 {
   tree p, encoding;
   tree sc_spec, decl_specs, decl;
@@ -3985,13 +3897,8 @@ generate_protocols ()
 }
 
 static tree
-build_protocol_initializer (type, protocol_name, protocol_list,
-			    instance_methods, class_methods)
-     tree type;
-     tree protocol_name;
-     tree protocol_list;
-     tree instance_methods;
-     tree class_methods;
+build_protocol_initializer (tree type, tree protocol_name, tree protocol_list,
+			    tree instance_methods, tree class_methods)
 {
   tree initlist = NULL_TREE, expr;
   tree cast_type;
@@ -4040,7 +3947,7 @@ build_protocol_initializer (type, protoc
    };   */
 
 static void
-build_category_template ()
+build_category_template (void)
 {
   tree decl_specs, field_decl, field_decl_chain;
 
@@ -4101,7 +4008,7 @@ build_category_template ()
    }; */
 
 static void
-build_selector_template ()
+build_selector_template (void)
 {
 
   tree decl_specs, field_decl, field_decl_chain;
@@ -4153,7 +4060,7 @@ build_selector_template ()
    compatibility (and to allow for future expansion).  */
 
 static void
-build_class_template ()
+build_class_template (void)
 {
   tree decl_specs, field_decl, field_decl_chain;
 
@@ -4296,7 +4203,7 @@ build_class_template ()
 /* Generate appropriate forward declarations for an implementation.  */
 
 static void
-synth_forward_declarations ()
+synth_forward_declarations (void)
 {
   tree an_id;
 
@@ -4316,10 +4223,7 @@ synth_forward_declarations ()
 }
 
 static void
-error_with_ivar (message, decl, rawdecl)
-     const char *message;
-     tree decl;
-     tree rawdecl;
+error_with_ivar (const char *message, tree decl, tree rawdecl)
 {
   error ("%H%s `%s'", &DECL_SOURCE_LOCATION (decl),
          message, gen_declaration (rawdecl, errbuf));
@@ -4327,9 +4231,7 @@ error_with_ivar (message, decl, rawdecl)
 }
 
 static void
-check_ivars (inter, imp)
-     tree inter;
-     tree imp;
+check_ivars (tree inter, tree imp)
 {
   tree intdecls = CLASS_IVARS (inter);
   tree impdecls = CLASS_IVARS (imp);
@@ -4391,7 +4293,7 @@ check_ivars (inter, imp)
    This needs to be done just once per compilation.  */
 
 static void
-build_super_template ()
+build_super_template (void)
 {
   tree decl_specs, field_decl, field_decl_chain;
 
@@ -4435,7 +4337,7 @@ build_super_template ()
    };  */
 
 static tree
-build_ivar_template ()
+build_ivar_template (void)
 {
   tree objc_ivar_id, objc_ivar_record;
   tree decl_specs, field_decl, field_decl_chain;
@@ -4478,9 +4380,7 @@ build_ivar_template ()
    };  */
 
 static tree
-build_ivar_list_template (list_type, size)
-     tree list_type;
-     int size;
+build_ivar_list_template (tree list_type, int size)
 {
   tree objc_ivar_list_record;
   tree decl_specs, field_decl, field_decl_chain;
@@ -4516,9 +4416,7 @@ build_ivar_list_template (list_type, siz
    };  */
 
 static tree
-build_method_list_template (list_type, size)
-     tree list_type;
-     int size;
+build_method_list_template (tree list_type, int size)
 {
   tree objc_ivar_list_record;
   tree decl_specs, field_decl, field_decl_chain;
@@ -4560,9 +4458,7 @@ build_method_list_template (list_type, s
 }
 
 static tree
-build_ivar_list_initializer (type, field_decl)
-     tree type;
-     tree field_decl;
+build_ivar_list_initializer (tree type, tree field_decl)
 {
   tree initlist = NULL_TREE;
 
@@ -4611,11 +4507,7 @@ build_ivar_list_initializer (type, field
 }
 
 static tree
-generate_ivars_list (type, name, size, list)
-     tree type;
-     const char *name;
-     int size;
-     tree list;
+generate_ivars_list (tree type, const char *name, int size, tree list)
 {
   tree sc_spec, decl_specs, decl, initlist;
 
@@ -4637,8 +4529,7 @@ generate_ivars_list (type, name, size, l
 
 /* Count only the fields occurring in T.  */
 static int
-ivar_list_length (t)
-     tree t;
+ivar_list_length (tree t)
 {
   int count = 0;
 
@@ -4650,7 +4541,7 @@ ivar_list_length (t)
 }
 
 static void
-generate_ivar_lists ()
+generate_ivar_lists (void)
 {
   tree initlist, ivar_list_template, chain;
   tree cast, variable_length_type;
@@ -4706,9 +4597,7 @@ generate_ivar_lists ()
 }
 
 static tree
-build_dispatch_table_initializer (type, entries)
-     tree type;
-     tree entries;
+build_dispatch_table_initializer (tree type, tree entries)
 {
   tree initlist = NULL_TREE;
 
@@ -4756,7 +4645,7 @@ build_dispatch_table_initializer (type, 
    	struct objc_method { SEL _cmd; ...; void *_imp; };  */
 
 static tree
-build_method_template ()
+build_method_template (void)
 {
   tree _SLT_record;
   tree decl_specs, field_decl, field_decl_chain;
@@ -4793,11 +4682,7 @@ build_method_template ()
 
 
 static tree
-generate_dispatch_table (type, name, size, list)
-     tree type;
-     const char *name;
-     int size;
-     tree list;
+generate_dispatch_table (tree type, const char *name, int size, tree list)
 {
   tree sc_spec, decl_specs, decl, initlist;
 
@@ -4819,7 +4704,7 @@ generate_dispatch_table (type, name, siz
 }
 
 static void
-mark_referenced_methods ()
+mark_referenced_methods (void)
 {
   struct imp_entry *impent;
   tree chain;
@@ -4843,7 +4728,7 @@ mark_referenced_methods ()
 }
 
 static void
-generate_dispatch_tables ()
+generate_dispatch_tables (void)
 {
   tree initlist, chain, method_list_template;
   tree cast, variable_length_type;
@@ -4911,8 +4796,7 @@ generate_dispatch_tables ()
 }
 
 static tree
-generate_protocol_list (i_or_p)
-     tree i_or_p;
+generate_protocol_list (tree i_or_p)
 {
   tree initlist, decl_specs, sc_spec;
   tree refs_decl, expr_decl, lproto, e, plist;
@@ -4998,14 +4882,9 @@ generate_protocol_list (i_or_p)
 }
 
 static tree
-build_category_initializer (type, cat_name, class_name,
-			    instance_methods, class_methods, protocol_list)
-     tree type;
-     tree cat_name;
-     tree class_name;
-     tree instance_methods;
-     tree class_methods;
-     tree protocol_list;
+build_category_initializer (tree type, tree cat_name, tree class_name,
+			    tree instance_methods, tree class_methods,
+			    tree protocol_list)
 {
   tree initlist = NULL_TREE, expr;
 
@@ -5071,17 +4950,10 @@ build_category_initializer (type, cat_na
    };  */
 
 static tree
-build_shared_structure_initializer (type, isa, super, name, size, status,
-				    dispatch_table, ivar_list, protocol_list)
-     tree type;
-     tree isa;
-     tree super;
-     tree name;
-     tree size;
-     int status;
-     tree dispatch_table;
-     tree ivar_list;
-     tree protocol_list;
+build_shared_structure_initializer (tree type, tree isa, tree super,
+				    tree name, tree size, int status,
+				    tree dispatch_table, tree ivar_list,
+				    tree protocol_list)
 {
   tree initlist = NULL_TREE, expr;
 
@@ -5168,8 +5040,7 @@ build_shared_structure_initializer (type
 /* static struct objc_category _OBJC_CATEGORY_<name> = { ... };  */
 
 static void
-generate_category (cat)
-     tree cat;
+generate_category (tree cat)
 {
   tree sc_spec, decl_specs, decl;
   tree initlist, cat_name_expr, class_name_expr;
@@ -5218,7 +5089,7 @@ generate_category (cat)
    static struct objc_class _OBJC_CLASS_Foo={ ... };  */
 
 static void
-generate_shared_structures ()
+generate_shared_structures (void)
 {
   tree sc_spec, decl_specs, decl;
   tree name_expr, super_expr, root_expr;
@@ -5321,9 +5192,7 @@ generate_shared_structures ()
 }
 
 static tree
-synth_id_with_class_suffix (preamble, ctxt)
-     const char *preamble;
-     tree ctxt;
+synth_id_with_class_suffix (const char *preamble, tree ctxt)
 {
   char *string;
   if (TREE_CODE (ctxt) == CLASS_IMPLEMENTATION_TYPE
@@ -5363,8 +5232,7 @@ synth_id_with_class_suffix (preamble, ct
 }
 
 static int
-is_objc_type_qualifier (node)
-     tree node;
+is_objc_type_qualifier (tree node)
 {
   return (TREE_CODE (node) == IDENTIFIER_NODE
 	  && (node == ridpointers [(int) RID_CONST]
@@ -5381,8 +5249,7 @@ is_objc_type_qualifier (node)
    type of id (otherwise grokdeclarator will default to int).  */
 
 static tree
-adjust_type_for_id_default (type)
-     tree type;
+adjust_type_for_id_default (tree type)
 {
   tree declspecs, chain;
 
@@ -5429,10 +5296,7 @@ adjust_type_for_id_default (type)
      Out:	an instance of "keyword_decl".  */
 
 tree
-build_keyword_decl (key_name, arg_type, arg_name)
-     tree key_name;
-     tree arg_type;
-     tree arg_name;
+build_keyword_decl (tree key_name, tree arg_type, tree arg_name)
 {
   tree keyword_decl;
 
@@ -5451,8 +5315,7 @@ build_keyword_decl (key_name, arg_type, 
 /* Given a chain of keyword_decl's, synthesize the full keyword selector.  */
 
 static tree
-build_keyword_selector (selector)
-     tree selector;
+build_keyword_selector (tree selector)
 {
   int len = 0;
   tree key_chain, key_name;
@@ -5505,11 +5368,8 @@ build_keyword_selector (selector)
 /* Used for declarations and definitions.  */
 
 tree
-build_method_decl (code, ret_type, selector, add_args)
-     enum tree_code code;
-     tree ret_type;
-     tree selector;
-     tree add_args;
+build_method_decl (enum tree_code code, tree ret_type, tree selector,
+		   tree add_args)
 {
   tree method_decl;
 
@@ -5549,10 +5409,7 @@ build_method_decl (code, ret_type, selec
    arguments (i.e., beyond self and _cmd) shall be represented by `...'.  */
 
 static tree
-get_arg_type_list (meth, context, superflag)
-     tree meth;
-     int context;
-     int superflag;
+get_arg_type_list (tree meth, int context, int superflag)
 {
   tree arglist, akey;
 
@@ -5597,9 +5454,7 @@ get_arg_type_list (meth, context, superf
 }
 
 static tree
-check_duplicates (hsh, methods)
-     hash hsh;
-     int methods;
+check_duplicates (hash hsh, int methods)
 {
   tree meth = NULL_TREE;
 
@@ -5631,9 +5486,7 @@ check_duplicates (hsh, methods)
    used.  */
 
 static tree
-receiver_is_class_object (receiver, self, super)
-      tree receiver;
-      int self, super;
+receiver_is_class_object (tree receiver, int self, int super)
 {
   tree chain, exp, arg;
 
@@ -5691,7 +5544,7 @@ receiver_is_class_object (receiver, self
 static tree current_objc_message_selector = 0;
 
 tree
-objc_message_selector ()
+objc_message_selector (void)
 {
   return current_objc_message_selector;
 }
@@ -5704,8 +5557,7 @@ objc_message_selector ()
    (*(<abstract_decl>(*)())_msgSuper)(receiver, selTransTbl[n], ...);  */
 
 tree
-build_message_expr (mess)
-     tree mess;
+build_message_expr (tree mess)
 {
   tree receiver = TREE_PURPOSE (mess);
   tree sel_name;
@@ -5759,8 +5611,7 @@ build_message_expr (mess)
 }
 
 static tree
-lookup_method_in_hash_lists (sel_name)
-     tree sel_name;
+lookup_method_in_hash_lists (tree sel_name)
 {
   hash method_prototype = hash_lookup (nst_method_hash_list, 
 				       sel_name);
@@ -5778,8 +5629,7 @@ lookup_method_in_hash_lists (sel_name)
    (in decl2.c) after RECEIVER and METHOD_PARAMS have been expanded.  */
 
 tree
-finish_message_expr (receiver, sel_name, method_params)
-     tree receiver, sel_name, method_params; 
+finish_message_expr (tree receiver, tree sel_name, tree method_params)
 {      
   tree method_prototype = NULL_TREE, rprotos = NULL_TREE, rtype;
   tree selector, retval, is_class;
@@ -5961,10 +5811,8 @@ finish_message_expr (receiver, sel_name,
    If SUPER_FLAG is nonzero, we look up the superclass's method.  */
 
 static tree
-build_objc_method_call (super_flag, method_prototype, lookup_object,
-			selector, method_params)
-     int super_flag;
-     tree method_prototype, lookup_object, selector, method_params;
+build_objc_method_call (int super_flag, tree method_prototype,
+			tree lookup_object, tree selector, tree method_params)
 {
   tree sender = (super_flag ? umsg_super_decl :
 		 (!flag_next_runtime || flag_nil_receivers
@@ -6043,8 +5891,7 @@ build_objc_method_call (super_flag, meth
 }

 static void
-build_protocol_reference (p)
-     tree p;
+build_protocol_reference (tree p)
 {
   tree decl, ident, ptype;
 
@@ -6076,8 +5923,7 @@ build_protocol_reference (p)
 /* This function is called by the parser when (and only when) a
    @protocol() expression is found, in order to compile it.  */
 tree
-build_protocol_expr (protoname)
-     tree protoname;
+build_protocol_expr (tree protoname)
 {
   tree expr;
   tree p = lookup_protocol (protoname);
@@ -6147,8 +5993,7 @@ build_protocol_expr (protoname)
    is found, in order to compile it.  It is only called by the parser
    and only to compile a @selector().  */
 tree
-build_selector_expr (selnamelist)
-     tree selnamelist;
+build_selector_expr (tree selnamelist)
 {
   tree selname;
 
@@ -6194,8 +6039,7 @@ build_selector_expr (selnamelist)
 }
 
 tree
-build_encode_expr (type)
-     tree type;
+build_encode_expr (tree type)
 {
   tree result;
   const char *string;
@@ -6212,8 +6056,7 @@ build_encode_expr (type)
 }
 
 tree
-build_ivar_reference (id)
-     tree id;
+build_ivar_reference (tree id)
 {
   if (TREE_CODE (objc_method_context) == CLASS_METHOD_DECL)
     {
@@ -6237,8 +6080,7 @@ build_ivar_reference (id)
 /* Compute a hash value for a given method SEL_NAME.  */
 
 static size_t
-hash_func (sel_name)
-     tree sel_name;
+hash_func (tree sel_name)
 {
   const unsigned char *s 
     = (const unsigned char *)IDENTIFIER_POINTER (sel_name);
@@ -6250,7 +6092,7 @@ hash_func (sel_name)
 }
      
 static void
-hash_init ()
+hash_init (void)
 {
   nst_method_hash_list 
     = (hash *) ggc_alloc_cleared (SIZEHASHTABLE * sizeof (hash));
@@ -6264,9 +6106,7 @@ hash_init ()
    entry's key (method) for comparison.  */
 
 static void
-hash_enter (hashlist, method)
-     hash *hashlist;
-     tree method;
+hash_enter (hash *hashlist, tree method)
 {
   hash obj;
   int slot = hash_func (METHOD_SEL_NAME (method)) % SIZEHASHTABLE;
@@ -6280,9 +6120,7 @@ hash_enter (hashlist, method)
 }
 
 static hash
-hash_lookup (hashlist, sel_name)
-     hash *hashlist;
-     tree sel_name;
+hash_lookup (hash *hashlist, tree sel_name)
 {
   hash target;
 
@@ -6299,9 +6137,7 @@ hash_lookup (hashlist, sel_name)
 }
 
 static void
-hash_add_attr (entry, value)
-     hash entry;
-     tree value;
+hash_add_attr (hash entry, tree value)
 {
   attr obj;
 
@@ -6313,9 +6149,7 @@ hash_add_attr (entry, value)
 }

 static tree
-lookup_method (mchain, method)
-     tree mchain;
-     tree method;
+lookup_method (tree mchain, tree method)
 {
   tree key;
 
@@ -6335,10 +6169,7 @@ lookup_method (mchain, method)
 }
 
 static tree
-lookup_method_static (interface, ident, is_class)
-     tree interface;
-     tree ident;
-     int is_class;
+lookup_method_static (tree interface, tree ident, int is_class)
 {
   tree meth = NULL_TREE, root_inter = NULL_TREE;
   tree inter = interface;
@@ -6392,10 +6223,7 @@ lookup_method_static (interface, ident, 
 }
 
 tree
-add_method (class, method, is_class)
-     tree class;
-     tree method;
-     int is_class;
+add_method (tree class, tree method, int is_class)
 {
   tree mth;
   hash hsh;
@@ -6448,8 +6276,7 @@ add_method (class, method, is_class)
 }
 
 static tree
-add_class (class)
-     tree class;
+add_class (tree class)
 {
   /* Put interfaces on list in reverse order.  */
   TREE_CHAIN (class) = interface_chain;
@@ -6458,9 +6285,7 @@ add_class (class)
 }
 
 static void
-add_category (class, category)
-      tree class;
-      tree category;
+add_category (tree class, tree category)
 {
   /* Put categories on list in reverse order.  */
   tree cat = CLASS_CATEGORY_LIST (class);
@@ -6488,12 +6313,8 @@ add_category (class, category)
    PUBLIC is 1 for public, 0 for protected, and 2 for private.  */
 
 tree
-add_instance_variable (class, public, declarator, declspecs, width)
-     tree class;
-     int public;
-     tree declarator;
-     tree declspecs;
-     tree width;
+add_instance_variable (tree class, int public, tree declarator, tree declspecs,
+		       tree width)
 {
   tree field_decl = grokfield (declarator, declspecs, width);
   tree field_type = TREE_TYPE (field_decl);
@@ -6581,9 +6402,7 @@ add_instance_variable (class, public, de
 }

 tree
-is_ivar (decl_chain, ident)
-     tree decl_chain;
-     tree ident;
+is_ivar (tree decl_chain, tree ident)
 {
   for ( ; decl_chain; decl_chain = TREE_CHAIN (decl_chain))
     if (DECL_NAME (decl_chain) == ident)
@@ -6594,8 +6413,7 @@ is_ivar (decl_chain, ident)
 /* True if the ivar is private and we are not in its implementation.  */
 
 int
-is_private (decl)
-     tree decl;
+is_private (tree decl)
 {
   if (TREE_PRIVATE (decl)
       && ! is_ivar (CLASS_IVARS (implementation_template), DECL_NAME (decl)))
@@ -6611,9 +6429,7 @@ is_private (decl)
 /* We have an instance variable reference;, check to see if it is public.  */
 
 int
-is_public (expr, identifier)
-     tree expr;
-     tree identifier;
+is_public (tree expr, tree identifier)
 {
   tree basetype = TREE_TYPE (expr);
   enum tree_code code = TREE_CODE (basetype);
@@ -6678,10 +6494,7 @@ is_public (expr, identifier)
 /* Make sure all entries in CHAIN are also in LIST.  */
 
 static int
-check_methods (chain, list, mtype)
-     tree chain;
-     tree list;
-     int mtype;
+check_methods (tree chain, tree list, int mtype)
 {
   int first = 1;
 
@@ -6715,9 +6528,7 @@ check_methods (chain, list, mtype)
 /* Check if CLASS, or its superclasses, explicitly conforms to PROTOCOL.  */
 
 static int
-conforms_to_protocol (class, protocol)
-     tree class;
-     tree protocol;
+conforms_to_protocol (tree class, tree protocol)
 {
    if (TREE_CODE (protocol) == PROTOCOL_INTERFACE_TYPE)
      {
@@ -6743,10 +6554,7 @@ conforms_to_protocol (class, protocol)
    CONTEXT.  This is one of two mechanisms to check protocol integrity.  */
 
 static int
-check_methods_accessible (chain, context, mtype)
-     tree chain;
-     tree context;
-     int mtype;
+check_methods_accessible (tree chain, tree context, int mtype)
 {
   int first = 1;
   tree list;
@@ -6810,10 +6618,7 @@ check_methods_accessible (chain, context
    with any protocols that P inherits.  */
    
 static void
-check_protocol (p, type, name)
-     tree p;
-     const char *type;
-     const char *name;
+check_protocol (tree p, const char *type, const char *name)
 {
   if (TREE_CODE (p) == PROTOCOL_INTERFACE_TYPE)
     {
@@ -6869,10 +6674,7 @@ check_protocol (p, type, name)
    in PROTO_LIST.  */
    
 static void
-check_protocols (proto_list, type, name)
-     tree proto_list;
-     const char *type;
-     const char *name;
+check_protocols (tree proto_list, const char *type, const char *name)
 {
   for ( ; proto_list; proto_list = TREE_CHAIN (proto_list))
     {
@@ -6888,11 +6690,8 @@ check_protocols (proto_list, type, name)
    CATEGORY_INTERFACE_TYPE, or CATEGORY_IMPLEMENTATION_TYPE.  */
 
 tree
-start_class (code, class_name, super_name, protocol_list)
-     enum tree_code code;
-     tree class_name;
-     tree super_name;
-     tree protocol_list;
+start_class (enum tree_code code, tree class_name, tree super_name,
+	     tree protocol_list)
 {
   tree class, decl;
 
@@ -7038,8 +6837,7 @@ start_class (code, class_name, super_nam
 }
 
 tree
-continue_class (class)
-     tree class;
+continue_class (tree class)
 {
   if (TREE_CODE (class) == CLASS_IMPLEMENTATION_TYPE
       || TREE_CODE (class) == CATEGORY_IMPLEMENTATION_TYPE)
@@ -7101,8 +6899,7 @@ continue_class (class)
 /* This is called once we see the "@end" in an interface/implementation.  */
 
 void
-finish_class (class)
-     tree class;
+finish_class (tree class)
 {
   if (TREE_CODE (class) == CLASS_IMPLEMENTATION_TYPE)
     {
@@ -7168,8 +6965,7 @@ finish_class (class)
 }
 
 static tree
-add_protocol (protocol)
-     tree protocol;
+add_protocol (tree protocol)
 {
   /* Put protocol on list in reverse order.  */
   TREE_CHAIN (protocol) = protocol_chain;
@@ -7178,8 +6974,7 @@ add_protocol (protocol)
 }
 
 static tree
-lookup_protocol (ident)
-     tree ident;
+lookup_protocol (tree ident)
 {
   tree chain;
 
@@ -7194,8 +6989,7 @@ lookup_protocol (ident)
    they are already declared or defined, the function has no effect.  */
 
 void
-objc_declare_protocols (names)
-     tree names;
+objc_declare_protocols (tree names)
 {
   tree list;
 
@@ -7224,10 +7018,7 @@ objc_declare_protocols (names)
 }
 
 tree
-start_protocol (code, name, list)
-     enum tree_code code;
-     tree name;
-     tree list;
+start_protocol (enum tree_code code, tree name, tree list)
 {
   tree protocol;
 
@@ -7273,8 +7064,7 @@ start_protocol (code, name, list)
 }
 
 void
-finish_protocol (protocol)
-     tree protocol ATTRIBUTE_UNUSED;
+finish_protocol (tree protocol ATTRIBUTE_UNUSED)
 {
 }
 
@@ -7283,8 +7073,7 @@ finish_protocol (protocol)
    ??? What is the FORMAT?  Someone please document this!  */
 
 static void
-encode_type_qualifiers (declspecs)
-     tree declspecs;
+encode_type_qualifiers (tree declspecs)
 {
   tree spec;
 
@@ -7310,10 +7099,7 @@ encode_type_qualifiers (declspecs)
 /* Encode a pointer type.  */
 
 static void
-encode_pointer (type, curtype, format)
-     tree type;
-     int curtype;
-     int format;
+encode_pointer (tree type, int curtype, int format)
 {
   tree pointer_to = TREE_TYPE (type);
 
@@ -7379,10 +7165,7 @@ encode_pointer (type, curtype, format)
 }
 
 static void
-encode_array (type, curtype, format)
-     tree type;
-     int curtype;
-     int format;
+encode_array (tree type, int curtype, int format)
 {
   tree an_int_cst = TYPE_SIZE (type);
   tree array_of = TREE_TYPE (type);
@@ -7406,12 +7189,8 @@ encode_array (type, curtype, format)
 }

 static void
-encode_aggregate_within (type, curtype, format, left, right)
-     tree type;
-     int curtype;
-     int format;
-     int left;
-     int right;
+encode_aggregate_within (tree type, int curtype, int format, int left,
+			 int right)
 {
   tree name;
   /* NB: aggregates that are pointed to have slightly different encoding
@@ -7478,10 +7257,7 @@ encode_aggregate_within (type, curtype, 
 }
 
 static void
-encode_aggregate (type, curtype, format)
-     tree type;
-     int curtype;
-     int format;
+encode_aggregate (tree type, int curtype, int format)
 {
   enum tree_code code = TREE_CODE (type);
 
@@ -7511,8 +7287,7 @@ encode_aggregate (type, curtype, format)
    field type.  */
 
 static void
-encode_next_bitfield (width)
-     int width;
+encode_next_bitfield (int width)
 {
   char buffer[40];
   sprintf (buffer, "b%d", width);
@@ -7522,10 +7297,7 @@ encode_next_bitfield (width)
 /* FORMAT will be OBJC_ENCODE_INLINE_DEFS or OBJC_ENCODE_DONT_INLINE_DEFS.  */
 
 static void
-encode_type (type, curtype, format)
-     tree type;
-     int curtype;
-     int format;
+encode_type (tree type, int curtype, int format)
 {
   enum tree_code code = TREE_CODE (type);
 
@@ -7601,10 +7373,7 @@ encode_type (type, curtype, format)
 }
 
 static void
-encode_gnu_bitfield (position, type, size)
-     int position;
-     tree type;
-     int size;
+encode_gnu_bitfield (int position, tree type, int size)
 {
   enum tree_code code = TREE_CODE (type);
   char buffer[40];
@@ -7660,10 +7429,7 @@ encode_gnu_bitfield (position, type, siz
 }
 
 static void
-encode_field_decl (field_decl, curtype, format)
-     tree field_decl;
-     int curtype;
-     int format;
+encode_field_decl (tree field_decl, int curtype, int format)
 {
   tree type;
 
@@ -7693,8 +7459,7 @@ encode_field_decl (field_decl, curtype, 
 }
 
 static tree
-objc_expr_last (complex_expr)
-     tree complex_expr;
+objc_expr_last (tree complex_expr)
 {
   tree next;
 
@@ -7705,7 +7470,7 @@ objc_expr_last (complex_expr)
   return complex_expr;
 }
 static void
-synth_self_and_ucmd_args ()
+synth_self_and_ucmd_args (void)
 {
   tree decl_specs;
   
@@ -7735,8 +7500,7 @@ synth_self_and_ucmd_args ()
    - synthesize the first two arguments, "self" and "_cmd".  */
 
 void
-start_method_def (method)
-     tree method;
+start_method_def (tree method)
 {
   /* Required to implement _msgSuper.  */
   objc_method_context = method;
@@ -7801,10 +7565,7 @@ start_method_def (method)
 }
 
 static void
-warn_with_method (message, mtype, method)
-     const char *message;
-     int mtype;
-     tree method;
+warn_with_method (const char *message, int mtype, tree method)
 {
   /* Add a readable method name to the warning.  */
   warning ("%H%s `%c%s'", &DECL_SOURCE_LOCATION (method),
@@ -7814,8 +7575,7 @@ warn_with_method (message, mtype, method
 /* Return 1 if METHOD is consistent with PROTO.  */
 
 static int
-comp_method_with_proto (method, proto)
-     tree method, proto;
+comp_method_with_proto (tree method, tree proto)
 {
   /* Create a function template node at most once.  */
   if (!function1_template)
@@ -7834,8 +7594,7 @@ comp_method_with_proto (method, proto)
 /* Return 1 if TYPE1 is equivalent to TYPE2.  */
 
 static int
-objc_types_are_equivalent (type1, type2)
-     tree type1, type2;
+objc_types_are_equivalent (tree type1, tree type2)
 {
   if (type1 == type2)
     return 1;
@@ -7856,8 +7615,7 @@ objc_types_are_equivalent (type1, type2)
 /* Return 1 if PROTO1 is equivalent to PROTO2.  */
 
 static int
-comp_proto_with_proto (proto1, proto2)
-     tree proto1, proto2;
+comp_proto_with_proto (tree proto1, tree proto2)
 {
   tree type1, type2;
 
@@ -7893,8 +7651,7 @@ comp_proto_with_proto (proto1, proto2)
    - If we have a prototype, check for type consistency.  */
 
 static void
-really_start_method (method, parmlist)
-     tree method, parmlist;
+really_start_method (tree method, tree parmlist)
 {
   tree sc_spec, ret_spec, ret_decl, decl_specs;
   tree method_decl, method_id;
@@ -8002,7 +7759,7 @@ really_start_method (method, parmlist)
    - a:a b:b // prototype  ; id c; id d; // old-style.  */
 
 void
-continue_method_def ()
+continue_method_def (void)
 {
   tree parmlist;
 
@@ -8032,7 +7789,7 @@ static void *UOBJC_SUPER_scope = 0;
      }  */
 
 tree
-get_super_receiver ()
+get_super_receiver (void)
 {
   if (objc_method_context)
     {
@@ -8141,7 +7898,7 @@ get_super_receiver ()
    therein contained.  */
 
 void
-objc_clear_super_receiver ()
+objc_clear_super_receiver (void)
 {
   if (objc_method_context 
       && UOBJC_SUPER_scope == get_current_scope ()) {
@@ -8151,7 +7908,7 @@ objc_clear_super_receiver ()
 }
 
 static void
-objc_expand_function_end ()
+objc_expand_function_end (void)
 {
   /* This routine may also get called for C functions, including those
      nested within ObjC methods.  In such cases, method encoding is
@@ -8165,7 +7922,7 @@ objc_expand_function_end ()
 }
 
 void
-finish_method_def ()
+finish_method_def (void)
 {
   lang_expand_function_end = objc_expand_function_end;
   /* We cannot validly inline ObjC methods, at least not without a language
@@ -8185,8 +7942,7 @@ finish_method_def ()
 
 #if 0
 int
-lang_report_error_function (decl)
-      tree decl;
+lang_report_error_function (tree decl)
 {
   if (objc_method_context)
     {
@@ -8201,8 +7957,7 @@ lang_report_error_function (decl)
 #endif
 
 static int
-is_complex_decl (type)
-     tree type;
+is_complex_decl (tree type)
 {
   return (TREE_CODE (type) == ARRAY_TYPE
 	  || TREE_CODE (type) == FUNCTION_TYPE
@@ -8215,9 +7970,7 @@ is_complex_decl (type)
 static char tmpbuf[256];
 
 static void
-adorn_decl (decl, str)
-     tree decl;
-     char *str;
+adorn_decl (tree decl, char *str)
 {
   enum tree_code code = TREE_CODE (decl);
 
@@ -8317,10 +8070,7 @@ adorn_decl (decl, str)
 }
 
 static char *
-gen_declarator (decl, buf, name)
-     tree decl;
-     char *buf;
-     const char *name;
+gen_declarator (tree decl, char *buf, const char *name)
 {
   if (decl)
     {
@@ -8409,10 +8159,7 @@ gen_declarator (decl, buf, name)
 }
 
 static void
-gen_declspecs (declspecs, buf, raw)
-     tree declspecs;
-     char *buf;
-     int raw;
+gen_declspecs (tree declspecs, char *buf, int raw)
 {
   if (raw)
     {
@@ -8664,9 +8411,7 @@ gen_declspecs (declspecs, buf, raw)
    buffer, overwriting the buffer.  */
 
 static char *
-gen_declaration (atype_or_adecl, buf)
-     tree atype_or_adecl;
-     char *buf;
+gen_declaration (tree atype_or_adecl, char *buf)
 {
   buf[0] = '\0';
   gen_declaration_1 (atype_or_adecl, buf);
@@ -8677,9 +8422,7 @@ gen_declaration (atype_or_adecl, buf)
    given buffer.  */
 
 static void
-gen_declaration_1 (atype_or_adecl, buf)
-     tree atype_or_adecl;
-     char *buf;
+gen_declaration_1 (tree atype_or_adecl, char *buf)
 {
   char declbuf[256];
 
@@ -8778,9 +8521,7 @@ gen_declaration_1 (atype_or_adecl, buf)
    buffer (overwriting) and return a pointer to the buffer.  */
 
 static char *
-gen_method_decl (method, buf)
-     tree method;
-     char *buf;
+gen_method_decl (tree method, char *buf)
 {
   tree chain;
 
@@ -8847,9 +8588,7 @@ gen_method_decl (method, buf)
    prints out an @interface declaration of all classes compiled in
    this run); potentially useful for debugging the compiler too.  */
 static void
-dump_interface (fp, chain)
-     FILE *fp;
-     tree chain;
+dump_interface (FILE *fp, tree chain)
 {
   /* FIXME: A heap overflow here whenever a method (or ivar)
      declaration is so long that it doesn't fit in the buffer.  The
@@ -8912,8 +8651,7 @@ dump_interface (fp, chain)
 
 /* Demangle function for Objective-C */
 static const char *
-objc_demangle (mangled)
-     const char *mangled;
+objc_demangle (const char *mangled)
 {
   char *demangled, *cp;
 
@@ -8968,15 +8706,13 @@ objc_demangle (mangled)
 }
 
 const char *
-objc_printable_name (decl, kind)
-     tree decl;
-     int kind ATTRIBUTE_UNUSED;
+objc_printable_name (tree decl, int kind ATTRIBUTE_UNUSED)
 {
   return objc_demangle (IDENTIFIER_POINTER (DECL_NAME (decl)));
 }
 
 static void
-init_objc ()
+init_objc (void)
 {
   gcc_obstack_init (&util_obstack);
   util_firstobj = (char *) obstack_finish (&util_obstack);
@@ -8987,7 +8723,7 @@ init_objc ()
 }

 static void
-finish_objc ()
+finish_objc (void)
 {
   struct imp_entry *impent;
   tree chain;
@@ -9109,8 +8845,7 @@ finish_objc ()
 /* Subroutines of finish_objc.  */
 
 static void
-generate_classref_translation_entry (chain)
-     tree chain;
+generate_classref_translation_entry (tree chain)
 {
   tree expr, name, decl_specs, decl, sc_spec;
   tree type;
@@ -9136,8 +8871,7 @@ generate_classref_translation_entry (cha
 }
 
 static void
-handle_class_ref (chain)
-     tree chain;
+handle_class_ref (tree chain)
 {
   const char *name = IDENTIFIER_POINTER (TREE_VALUE (chain));
   char *string = (char *) alloca (strlen (name) + 30);
@@ -9177,8 +8911,7 @@ handle_class_ref (chain)
 }
 
 static void
-handle_impent (impent)
-     struct imp_entry *impent;
+handle_impent (struct imp_entry *impent)
 {
   char *string;
 
@@ -9246,7 +8979,7 @@ handle_impent (impent)
 /* static int _OBJC_IMAGE_INFO[2] = { 0, 1 }; */
 
 static void
-generate_objc_image_info ()
+generate_objc_image_info (void)
 {
   tree sc_spec, decl, initlist;
 
@@ -9273,8 +9006,7 @@ generate_objc_image_info ()
 
 /* Look up ID as an instance variable.  */
 tree
-lookup_objc_ivar (id)
-     tree id;
+lookup_objc_ivar (tree id)
 {
   tree decl;
 
============================================================
Index: gcc/objc/objc-act.h
--- gcc/objc/objc-act.h	27 Aug 2003 00:19:24 -0000	1.16.4.2
+++ gcc/objc/objc-act.h	16 Sep 2003 07:49:11 -0000
@@ -24,64 +24,64 @@ Boston, MA 02111-1307, USA.  */
 
 /*** Public Interface (procedures) ***/
 
-bool objc_init					PARAMS ((void));
-const char *objc_printable_name			PARAMS ((tree, int));
+bool objc_init (void);
+const char *objc_printable_name (tree, int);
 
 /* used by yyparse */
 
-void finish_file				PARAMS ((void));
-tree start_class				PARAMS ((enum tree_code, tree, tree, tree));
-tree continue_class				PARAMS ((tree));
-void finish_class				PARAMS ((tree));
-void start_method_def				PARAMS ((tree));
-void continue_method_def			PARAMS ((void));
-void finish_method_def				PARAMS ((void));
-tree start_protocol				PARAMS ((enum tree_code, tree, tree));
-void finish_protocol				PARAMS ((tree));
-
-tree objc_build_throw_stmt			PARAMS ((tree));
-tree objc_build_try_catch_finally_stmt		PARAMS ((int, int));
-void objc_build_synchronized_prologue		PARAMS ((tree));
-tree objc_build_synchronized_epilogue		PARAMS ((void));
-tree objc_build_try_prologue			PARAMS ((void));
-void objc_build_try_epilogue			PARAMS ((int));
-void objc_build_catch_stmt			PARAMS ((tree));
-void objc_build_catch_epilogue			PARAMS ((void));
-tree objc_build_finally_prologue		PARAMS ((void));
-tree objc_build_finally_epilogue		PARAMS ((void));
-
-tree is_ivar					PARAMS ((tree, tree));
-int is_private					PARAMS ((tree));
-int is_public					PARAMS ((tree, tree));
-tree add_instance_variable			PARAMS ((tree, int, tree, tree, tree));
-tree add_method					PARAMS ((tree, tree, int));
-tree get_super_receiver				PARAMS ((void));
-void objc_clear_super_receiver			PARAMS ((void));
-tree get_class_ivars_from_name			PARAMS ((tree));
-tree get_class_reference			PARAMS ((tree));
-tree get_static_reference			PARAMS ((tree, tree));
-tree get_object_reference			PARAMS ((tree));
-tree build_message_expr				PARAMS ((tree));
-tree finish_message_expr			PARAMS ((tree, tree, tree));
-tree build_selector_expr			PARAMS ((tree));
-tree build_ivar_reference			PARAMS ((tree));
-tree build_keyword_decl				PARAMS ((tree, tree, tree));
-tree build_method_decl				PARAMS ((enum tree_code, tree, tree, tree));
-tree build_protocol_expr			PARAMS ((tree));
-tree build_objc_string_object			PARAMS ((tree));
-
-void objc_declare_alias				PARAMS ((tree, tree));
-void objc_declare_class				PARAMS ((tree));
-void objc_declare_protocols			PARAMS ((tree));
+void finish_file (void);
+tree start_class (enum tree_code, tree, tree, tree);
+tree continue_class (tree);
+void finish_class (tree);
+void start_method_def (tree);
+void continue_method_def (void);
+void finish_method_def (void);
+tree start_protocol (enum tree_code, tree, tree);
+void finish_protocol (tree);
+
+tree objc_build_throw_stmt (tree);
+tree objc_build_try_catch_finally_stmt (int, int);
+void objc_build_synchronized_prologue (tree);
+tree objc_build_synchronized_epilogue (void);
+tree objc_build_try_prologue (void);
+void objc_build_try_epilogue (int);
+void objc_build_catch_stmt (tree);
+void objc_build_catch_epilogue (void);
+tree objc_build_finally_prologue (void);
+tree objc_build_finally_epilogue (void);
+
+tree is_ivar (tree, tree);
+int is_private (tree);
+int is_public (tree, tree);
+tree add_instance_variable (tree, int, tree, tree, tree);
+tree add_method (tree, tree, int);
+tree get_super_receiver (void);
+void objc_clear_super_receiver (void);
+tree get_class_ivars_from_name (tree);
+tree get_class_reference (tree);
+tree get_static_reference (tree, tree);
+tree get_object_reference (tree);
+tree build_message_expr (tree);
+tree finish_message_expr (tree, tree, tree);
+tree build_selector_expr (tree);
+tree build_ivar_reference (tree);
+tree build_keyword_decl (tree, tree, tree);
+tree build_method_decl (enum tree_code, tree, tree, tree);
+tree build_protocol_expr (tree);
+tree build_objc_string_object (tree);
+
+void objc_declare_alias (tree, tree);
+void objc_declare_class (tree);
+void objc_declare_protocols (tree);
 
 /* the following routines are used to implement statically typed objects */
 
-int objc_comptypes				PARAMS ((tree, tree, int));
-void objc_check_decl				PARAMS ((tree));
+int objc_comptypes (tree, tree, int);
+void objc_check_decl (tree);
 
 /* NeXT extensions */
 
-tree build_encode_expr				PARAMS ((tree));
+tree build_encode_expr (tree);
 
 /* Objective-C structures */
 
@@ -169,7 +169,7 @@ struct hashed_entry GTY(())
 extern GTY ((length ("SIZEHASHTABLE"))) hash *nst_method_hash_list;
 extern GTY ((length ("SIZEHASHTABLE"))) hash *cls_method_hash_list;
 
-#define SIZEHASHTABLE 		257
+#define SIZEHASHTABLE		257
 
 /* Objective-C/Objective-C++ @implementation list.  */
 
@@ -399,9 +399,9 @@ extern GTY(()) tree objc_global_trees[OC
 #define objc_setjmp_decl	objc_global_trees[OCTI_SETJMP_DECL]
 #define objc_stack_exception_data		\
 				objc_global_trees[OCTI_STACK_EXCEPTION_DATA_DECL]
-#define objc_caught_exception	objc_global_trees[OCTI_LOCAL_EXCEPTION_DECL]	
-#define objc_rethrow_exception	objc_global_trees[OCTI_RETHROW_EXCEPTION_DECL]	
-#define objc_eval_once		objc_global_trees[OCTI_EVAL_ONCE_DECL]	
+#define objc_caught_exception	objc_global_trees[OCTI_LOCAL_EXCEPTION_DECL]
+#define objc_rethrow_exception	objc_global_trees[OCTI_RETHROW_EXCEPTION_DECL]
+#define objc_eval_once		objc_global_trees[OCTI_EVAL_ONCE_DECL]
 #define objc_exception_block_stack		\
 				objc_global_trees[OCTI_EXCEPTION_BLK_STACK]
 #define objc_catch_type		objc_global_trees[OCTI_CATCH_TYPE]
@@ -416,7 +416,7 @@ extern GTY(()) tree objc_global_trees[OC
 				objc_global_trees[OCTI_METH_PROTO_TEMPL]
 #define function1_template	objc_global_trees[OCTI_FUNCTION1_TEMPL]
 #define function2_template	objc_global_trees[OCTI_FUNCTION2_TEMPL]
-				
+
 #define objc_object_id		objc_global_trees[OCTI_OBJ_ID]
 #define objc_class_id		objc_global_trees[OCTI_CLS_ID]
 #define objc_id_id		objc_global_trees[OCTI_ID_ID]

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]