--- binutils-HEAD/bfd/elf32-vax.c~	2004-06-30 18:07:29.000000000 +0200
+++ binutils-HEAD/bfd/elf32-vax.c	2004-06-30 18:26:37.000000000 +0200
@@ -26,42 +26,34 @@
 #include "elf-bfd.h"
 #include "elf/vax.h"
 
-static reloc_howto_type *reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void rtype_to_howto
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static reloc_howto_type *reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+static void rtype_to_howto (bfd *, arelent *, Elf_Internal_Rela *);
 static struct bfd_hash_entry *elf_vax_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *elf_vax_link_hash_table_create
-  PARAMS ((bfd *));
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+static struct bfd_link_hash_table *elf_vax_link_hash_table_create (bfd *);
 static bfd_boolean elf_vax_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
+  (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
 static asection *elf_vax_gc_mark_hook
-  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
-	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
+  (asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+  struct elf_link_hash_entry *, Elf_Internal_Sym *);
 static bfd_boolean elf_vax_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
+  (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
 static bfd_boolean elf_vax_adjust_dynamic_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+  (struct bfd_link_info *, struct elf_link_hash_entry *);
 static bfd_boolean elf_vax_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
+  (bfd *, struct bfd_link_info *);
 static bfd_boolean elf_vax_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+  Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
 static bfd_boolean elf_vax_finish_dynamic_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-	   Elf_Internal_Sym *));
+  (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+  Elf_Internal_Sym *);
 static bfd_boolean elf_vax_finish_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
+  (bfd *, struct bfd_link_info *);
 
-static bfd_boolean elf32_vax_set_private_flags
-  PARAMS ((bfd *, flagword));
-static bfd_boolean elf32_vax_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static bfd_boolean elf32_vax_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
+static bfd_boolean elf32_vax_set_private_flags (bfd *, flagword);
+static bfd_boolean elf32_vax_merge_private_bfd_data (bfd *, bfd *);
+static bfd_boolean elf32_vax_print_private_bfd_data (bfd *, PTR);
 
 static reloc_howto_type howto_table[] = {
   HOWTO (R_VAX_NONE,		/* type */
@@ -415,12 +407,12 @@
 /* Declare this now that the above structures are defined.  */
 
 static bfd_boolean elf_vax_discard_copies
-  PARAMS ((struct elf_vax_link_hash_entry *, PTR));
+  (struct elf_vax_link_hash_entry *, PTR);
 
 /* Declare this now that the above structures are defined.  */
 
 static bfd_boolean elf_vax_instantiate_got_entries
-  PARAMS ((struct elf_link_hash_entry *, PTR));
+  (struct elf_link_hash_entry *, PTR);
 
 /* Traverse an VAX ELF linker hash table.  */
 
@@ -438,10 +430,9 @@
 /* Create an entry in an VAX ELF linker hash table.  */
 
 static struct bfd_hash_entry *
-elf_vax_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
+elf_vax_link_hash_newfunc (struct bfd_hash_entry *entry,
+			   struct bfd_hash_table *table,
+			   const char *string)
 {
   struct elf_vax_link_hash_entry *ret =
     (struct elf_vax_link_hash_entry *) entry;
@@ -470,8 +461,7 @@
 /* Create an VAX ELF linker hash table.  */
 
 static struct bfd_link_hash_table *
-elf_vax_link_hash_table_create (abfd)
-     bfd *abfd;
+elf_vax_link_hash_table_create (bfd *abfd)
 {
   struct elf_vax_link_hash_table *ret;
   bfd_size_type amt = sizeof (struct elf_vax_link_hash_table);
@@ -491,10 +481,9 @@
 }
 
 /* Keep vax-specific flags in the ELF header */
+
 static bfd_boolean
-elf32_vax_set_private_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
+elf32_vax_set_private_flags (bfd *abfd, flagword flags)
 {
   elf_elfheader (abfd)->e_flags = flags;
   elf_flags_init (abfd) = TRUE;
@@ -503,10 +492,9 @@
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
+
 static bfd_boolean
-elf32_vax_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
+elf32_vax_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 {
   flagword out_flags;
   flagword in_flags;
@@ -528,10 +516,9 @@
 }
 
 /* Display the flags field */
+
 static bfd_boolean
-elf32_vax_print_private_bfd_data (abfd, ptr)
-     bfd *abfd;
-     PTR ptr;
+elf32_vax_print_private_bfd_data (bfd *abfd, PTR ptr)
 {
   FILE *file = (FILE *) ptr;
 
@@ -558,16 +545,14 @@
 
   return TRUE;
 }
+
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
 
 static bfd_boolean
-elf_vax_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
+elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
+		      const Elf_Internal_Rela *relocs)
 {
   bfd *dynobj;
   Elf_Internal_Shdr *symtab_hdr;
@@ -844,12 +829,11 @@
    relocation.  */
 
 static asection *
-elf_vax_gc_mark_hook (sec, info, rel, h, sym)
-     asection *sec;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
+elf_vax_gc_mark_hook (asection *sec,
+		      struct bfd_link_info *info ATTRIBUTE_UNUSED,
+		      Elf_Internal_Rela *rel,
+		      struct elf_link_hash_entry *h,
+		      Elf_Internal_Sym *sym)
 {
   if (h != NULL)
     {
@@ -883,11 +867,8 @@
 /* Update the got entry reference counts for the section being removed.  */
 
 static bfd_boolean
-elf_vax_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
+elf_vax_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info, asection *sec,
+		       const Elf_Internal_Rela *relocs)
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
@@ -950,9 +931,8 @@
    understand.  */
 
 static bfd_boolean
-elf_vax_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
+elf_vax_adjust_dynamic_symbol (struct bfd_link_info *info,
+			       struct elf_link_hash_entry *h)
 {
   bfd *dynobj;
   asection *s;
@@ -1133,9 +1113,7 @@
 /* Set the sizes of the dynamic sections.  */
 
 static bfd_boolean
-elf_vax_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
+elf_vax_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
 {
   bfd *dynobj;
   asection *s;
@@ -1339,9 +1317,8 @@
    routine, but we won't fill them in in the relocate_section routine.  */
 
 static bfd_boolean
-elf_vax_discard_copies (h, ignore)
-     struct elf_vax_link_hash_entry *h;
-     PTR ignore ATTRIBUTE_UNUSED;
+elf_vax_discard_copies (struct elf_vax_link_hash_entry *h,
+			PTR ignore ATTRIBUTE_UNUSED)
 {
   struct elf_vax_pcrel_relocs_copied *s;
 
@@ -1366,9 +1343,8 @@
    will be reserved for the symbol.  */
 
 static bfd_boolean
-elf_vax_instantiate_got_entries (h, infoptr)
-     struct elf_link_hash_entry *h;
-     PTR infoptr;
+elf_vax_instantiate_got_entries (struct elf_link_hash_entry *h,
+				 PTR infoptr)
 {
   struct bfd_link_info *info = (struct bfd_link_info *) infoptr;
   bfd *dynobj;
@@ -1414,16 +1390,11 @@
 /* Relocate an VAX ELF section.  */
 
 static bfd_boolean
-elf_vax_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
+elf_vax_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+			  bfd *input_bfd, asection *input_section,
+			  bfd_byte *contents, Elf_Internal_Rela *relocs,
+			  Elf_Internal_Sym *local_syms,
+			  asection **local_sections)
 {
   bfd *dynobj;
   Elf_Internal_Shdr *symtab_hdr;
@@ -1851,11 +1822,9 @@
    dynamic sections here.  */
 
 static bfd_boolean
-elf_vax_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
+elf_vax_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info,
+			       struct elf_link_hash_entry *h,
+			       Elf_Internal_Sym *sym)
 {
   bfd *dynobj;
 
@@ -2006,9 +1975,7 @@
 /* Finish up the dynamic sections.  */
 
 static bfd_boolean
-elf_vax_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
+elf_vax_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
 {
   bfd *dynobj;
   asection *sgot;
--- binutils-HEAD/gas/config/atof-vax.c~	2004-06-30 20:37:16.000000000 +0200
+++ binutils-HEAD/gas/config/atof-vax.c	2004-06-30 21:08:00.000000000 +0200
@@ -21,11 +21,11 @@
 
 #include "as.h"
 
-static int atof_vax_sizeof PARAMS ((int));
-static int next_bits PARAMS ((int));
-static void make_invalid_floating_point_number PARAMS ((LITTLENUM_TYPE *));
-static int what_kind_of_float PARAMS ((int, int *, long *));
-static char *atof_vax PARAMS ((char *, int, LITTLENUM_TYPE *));
+static int atof_vax_sizeof (int);
+static int next_bits (int);
+static void make_invalid_floating_point_number (LITTLENUM_TYPE *);
+static int what_kind_of_float (int, int *, long *);
+static char *atof_vax (char *, int, LITTLENUM_TYPE *);
 
 /* Precision in LittleNums.  */
 #define MAX_PRECISION (8)
@@ -37,13 +37,11 @@
 /* Length in LittleNums of guard bits.  */
 #define GUARD (2)
 
-int flonum_gen2vax PARAMS ((int format_letter, FLONUM_TYPE * f,
-			    LITTLENUM_TYPE * words));
+int flonum_gen2vax (int format_letter, FLONUM_TYPE * f, LITTLENUM_TYPE * words);
 
 /* Number of chars in flonum type 'letter'.  */
 static int
-atof_vax_sizeof (letter)
-     int letter;
+atof_vax_sizeof (int letter)
 {
   int return_value;
 
@@ -122,8 +120,7 @@
 static LITTLENUM_TYPE *littlenum_end;
 
 static int
-next_bits (number_of_bits)
-     int number_of_bits;
+next_bits (int number_of_bits)
 {
   int return_value;
 
@@ -148,17 +145,16 @@
 }
 
 static void
-make_invalid_floating_point_number (words)
-     LITTLENUM_TYPE *words;
+make_invalid_floating_point_number (LITTLENUM_TYPE *words)
 {
   *words = 0x8000;		/* Floating Reserved Operand Code */
 }
 
+/* letter:		What kind of float (please supply it in lowercase)
+   precisionP:		Number of 16-bit words in the float.
+   exponent_bitsP:	Number of exponent bits.  */
 static int			/* 0 means letter is OK.  */
-what_kind_of_float (letter, precisionP, exponent_bitsP)
-     int letter;		/* In: lowercase please. What kind of float? */
-     int *precisionP;		/* Number of 16-bit words in the float.  */
-     long *exponent_bitsP;	/* Number of exponent bits.  */
+what_kind_of_float (int letter, int *precisionP, long *exponent_bitsP)
 {
   int retval;			/* 0: OK.  */
 
@@ -201,11 +197,11 @@
  *									*
  \***********************************************************************/
 
+/*  str:	text to convert to binary
+    what_kind:	'd', 'f', 'g', 'h'
+    words:	destination for the binary value  */
 static char *				/* Return pointer past text consumed.  */
-atof_vax (str, what_kind, words)
-     char *str;			/* Text to convert to binary.  */
-     int what_kind;		/* 'd', 'f', 'g', 'h' */
-     LITTLENUM_TYPE *words;	/* Build the binary here.  */
+atof_vax (char *str, int what_kind, LITTLENUM_TYPE *words)
 {
   FLONUM_TYPE f;
   LITTLENUM_TYPE bits[MAX_PRECISION + MAX_PRECISION + GUARD];
@@ -256,14 +252,11 @@
 
 /*
  * In: a flonum, a vax floating point format.
- * Out: a vax floating-point bit pattern.
+ * Out: a vax floating-point bit pattern in words.
  */
 
 int				/* 0: OK.  */
-flonum_gen2vax (format_letter, f, words)
-     int format_letter;		/* One of 'd' 'f' 'g' 'h'.  */
-     FLONUM_TYPE *f;
-     LITTLENUM_TYPE *words;	/* Deliver answer here.  */
+flonum_gen2vax (int format_letter, FLONUM_TYPE *f, LITTLENUM_TYPE *words)
 {
   LITTLENUM_TYPE *lp;
   int precision;
@@ -448,10 +441,7 @@
 #define MAXIMUM_NUMBER_OF_LITTLENUMS (8)	/* For .hfloats.  */
 
 char *
-md_atof (what_statement_type, literalP, sizeP)
-     int what_statement_type;
-     char *literalP;
-     int *sizeP;
+md_atof (int what_statement_type, char *literalP, int *sizeP)
 {
   LITTLENUM_TYPE words[MAXIMUM_NUMBER_OF_LITTLENUMS];
   register char kind_of_float;
--- binutils-HEAD/gas/config/obj-evax.c~	2004-06-30 21:09:17.000000000 +0200
+++ binutils-HEAD/gas/config/obj-evax.c	2004-06-30 21:09:41.000000000 +0200
@@ -24,7 +24,7 @@
 
 #include "as.h"
 
-static void s_evax_weak PARAMS ((int));
+static void s_evax_weak (int);
 
 const pseudo_typeS obj_pseudo_table[] =
 {
@@ -37,8 +37,7 @@
 /* Handle the weak specific pseudo-op.  */
 
 static void
-s_evax_weak (ignore)
-     int ignore;
+s_evax_weak (int ignore)
 {
   char *name;
   int c;
--- binutils-HEAD/gas/config/tc-vax.c~	2004-06-30 21:13:02.000000000 +0200
+++ binutils-HEAD/gas/config/tc-vax.c	2004-06-30 21:35:43.000000000 +0200
@@ -238,7 +238,7 @@
 #undef WF
 #undef WB
 
-void float_cons PARAMS ((int));
+void float_cons (int);
 
 const pseudo_typeS md_pseudo_table[] =
 {
@@ -262,16 +262,15 @@
 
 #define min(a, b)	((a) < (b) ? (a) : (b))
 
-int flonum_gen2vax PARAMS ((char format_letter, FLONUM_TYPE * f,
-			    LITTLENUM_TYPE * words));
-static const char *vip_begin PARAMS ((int, const char *, const char *,
-				      const char *));
-static void vip_op_1 PARAMS ((int, const char *));
-static void vip_op_defaults PARAMS ((const char *, const char *, const char *));
-static void vip_op PARAMS ((char *, struct vop *));
-static void vip PARAMS ((struct vit *, char *));
+int flonum_gen2vax (char format_letter, FLONUM_TYPE * f,
+			    LITTLENUM_TYPE * words);
+static const char *vip_begin (int, const char *, const char *, const char *);
+static void vip_op_1 (int, const char *);
+static void vip_op_defaults (const char *, const char *, const char *);
+static void vip_op (char *, struct vop *);
+static void vip (struct vit *, char *);
 
-static int vax_reg_parse PARAMS ((char, char, char, char));
+static int vax_reg_parse (char, char, char, char);
 
 void
 md_begin ()
@@ -295,10 +294,7 @@
 }
 
 void
-md_number_to_chars (con, value, nbytes)
-     char con[];
-     valueT value;
-     int nbytes;
+md_number_to_chars (char con[], valueT value, intnbytes)
 {
   number_to_chars_littleendian (con, value, nbytes);
 }
@@ -307,10 +303,7 @@
    that they reference.  */
 
 void				/* Knows about order of bytes in address.  */
-md_apply_fix3 (fixP, valueP, seg)
-     fixS *fixP;
-     valueT *valueP;
-     segT seg ATTRIBUTE_UNUSED;
+md_apply_fix3 (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED)
 {
   valueT value = * valueP;
 #ifdef BFD_ASSEMBLER
@@ -326,10 +319,10 @@
     fixP->fx_done = 1;
 }
 
+/* con:	Low order bytes first!
+   nbytes: number of bytes in input  */
 long
-md_chars_to_number (con, nbytes)
-     unsigned char con[];	/* Low order byte 1st.  */
-     int nbytes;		/* Number of bytes in the input.  */
+md_chars_to_number (unsigned char con[], int nbytes)
 {
   long retval;
   for (retval = 0, con += nbytes - 1; nbytes--; con--)
@@ -343,8 +336,7 @@
 /* vax:md_assemble() emit frags for 1 instruction */
 
 void
-md_assemble (instruction_string)
-     char *instruction_string;	/* A string: assemble 1 instruction.  */
+md_assemble (char *instruction_string)
 {
   /* Non-zero if operand expression's segment is not known yet.  */
   int is_undefined;
@@ -1223,9 +1215,7 @@
    Return the correct fr_subtype in the frag and the growth beyond
    fr_fix.  */
 int
-md_estimate_size_before_relax (fragP, segment)
-     fragS *fragP;
-     segT segment;
+md_estimate_size_before_relax (fragS *fragP, segT segment)
 {
   if (RELAX_LENGTH (fragP->fr_subtype) == STATE_UNDF)
     {
@@ -1381,16 +1371,12 @@
  */
 #ifdef BFD_ASSEMBLER
 void
-md_convert_frag (headers, seg, fragP)
-     bfd *headers ATTRIBUTE_UNUSED;
-     segT seg ATTRIBUTE_UNUSED;
-     fragS *fragP;
+md_convert_frag (bfd *headers ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED,
+		 fragS *fragP)
 #else
 void
-md_convert_frag (headers, seg, fragP)
-     object_headers *headers ATTRIBUTE_UNUSED;
-     segT seg ATTRIBUTE_UNUSED;
-     fragS *fragP;
+md_convert_frag (object_headers *headers ATTRIBUTE_UNUSED,
+		 segT seg ATTRIBUTE_UNUSED, fragS *fragP)
 #endif
 {
   char *addressP;		/* -> _var to change.  */
@@ -1540,9 +1526,7 @@
    bit 0 as pcrel.  */
 #ifdef comment
 void
-md_ri_to_chars (the_bytes, ri)
-     char *the_bytes;
-     struct reloc_info_generic ri;
+md_ri_to_chars (char *the_bytes, struct reloc_info_generic ri)
 {
   /* this is easy */
   md_number_to_chars (the_bytes, ri.r_address, sizeof (ri.r_address));
@@ -1559,10 +1543,8 @@
 #ifdef OBJ_AOUT
 #ifndef BFD_ASSEMBLER
 void
-tc_aout_fix_to_chars (where, fixP, segment_address_in_file)
-     char *where;
-     fixS *fixP;
-     relax_addressT segment_address_in_file;
+tc_aout_fix_to_chars (char *where, fixS *fixP,
+		      relax_addressT segment_address_in_file)
 {
   /*
    * In: length of relocation (or of address) in chars: 1, 2 or 4.
@@ -1736,13 +1718,13 @@
  *
  */
 #if (VIT_OPCODE_SYNTHETIC != 0x80000000)
-You have just broken the encoding below, which assumes the sign bit
-  means 'I am an imaginary instruction'.
+#  error "You have just broken the encoding below, which assumes the sign bit"
+#  error "means 'I am an imaginary instruction'."
 #endif
 
 #if (VIT_OPCODE_SPECIAL != 0x40000000)
-  You have just broken the encoding below, which assumes the 0x40 M bit means
-  'I am not to be "optimised" the way normal branches are'.
+#  error "You have just broken the encoding below, which assumes the 0x40 M bit"
+#  error "means 'I am not to be "optimised" the way normal branches are'."
 #endif
 
 static const struct vot
@@ -1805,15 +1787,15 @@
  * Call me once before you decode any lines.
  * I decode votstrs into a hash table at op_hash (which I create).
  * I return an error text or null.
- * If you want, I will include the 'synthetic' jXXX instructions in the
- * instruction table.
+ * If you want (synthetic_too == 1), I will include the 'synthetic'
+ * jXXX instructions in the instruction table
+ *
  * You must nominate metacharacters for eg DEC's "#", "@", "^".
  */
 
 static const char *
-vip_begin (synthetic_too, immediate, indirect, displen)
-     int synthetic_too;		/* 1 means include jXXX op-codes.  */
-     const char *immediate, *indirect, *displen;
+vip_begin (int synthetic_too, const char *immediate, const char *indirect,
+	   const char *displen)
 {
   const struct vot *vP;		/* scan votstrs */
   const char *retval = 0;	/* error text */
@@ -1859,9 +1841,7 @@
  */
 
 static void
-vip (vitP, instring)
-     struct vit *vitP;		/* We build an exploded instruction here.  */
-     char *instring;		/* Text of a vax instruction: we modify.  */
+vip (struct vit *vitP, char *instring)
 {
   /* How to bit-encode this opcode.  */
   struct vot_wot *vwP;
@@ -2104,9 +2084,9 @@
 #define SP (14)
 #define PC (15)
 
+/* 
 int				/* return -1 or 0:15 */
-vax_reg_parse (c1, c2, c3, c4)	/* 3 chars of register name */
-     char c1, c2, c3, c4;	/* c3 == 0 if 2-character reg name */
+vax_reg_parse (char c1, char c2, char c3, char c4)	/* 3 chars of register name */
 {
   int retval;		/* return -1:15 */
 
@@ -2326,9 +2306,7 @@
 static char vip_metacharacters[256];
 
 static void
-vip_op_1 (bit, syms)
-     int bit;
-     const char *syms;
+vip_op_1 (int bit, const char *syms)
 {
   unsigned char t;
 
@@ -2338,10 +2316,8 @@
 
 /* Can be called any time.  More arguments may appear in future.  */
 static void
-vip_op_defaults (immediate, indirect, displen)
-     const char *immediate;
-     const char *indirect;
-     const char *displen;
+vip_op_defaults (const char *immediate, const char *indirect,
+		 const char *displen)
 {
   vip_op_1 (VIP_IMMEDIATE, immediate);
   vip_op_1 (VIP_INDIRECT, indirect);
@@ -2407,17 +2383,16 @@
  * ndx                    index register number 0:15    -1 means absent
  *
  * Again, I dare not explain it: just trace ALL the code!
+ *
+ * optext:	input string, e.g.: "@B^foo@bar(AP)[FP]:"
+ * vopP:	Input fields: vop_access, vop_width.
+ * 		Output fields: _ndx, _reg, _mode, _short, _warn,
+ * 		_error _expr_begin, _expr_end, _nbytes,
+ * 		
  */
 
 static void
-vip_op (optext, vopP)
-     /* user's input string e.g.: "@B^foo@bar(AP)[FP]:" */
-     char *optext;
-     /* Input fields: vop_access, vop_width.
-	Output fields: _ndx, _reg, _mode, _short, _warn,
-	_error _expr_begin, _expr_end, _nbytes.
-	vop_nbytes : number of bytes in a datum.  */
-     struct vop *vopP;
+vip_op (char *optext, struct vop *vopP)
 {
   /* track operand text forward */
   char *p;
@@ -3198,9 +3173,7 @@
     }
 }
 
-mumble (text, value)
-     char *text;
-     int value;
+mumble (char *text, int value)
 {
   printf ("%s:", text);
   if (value >= 0)
@@ -3219,12 +3192,10 @@
 const int md_reloc_size = 8;	/* Size of relocation record */
 
 void
-md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
-     char *ptr;
-     addressT from_addr;
-     addressT to_addr ATTRIBUTE_UNUSED;
-     fragS *frag ATTRIBUTE_UNUSED;
-     symbolS *to_symbol ATTRIBUTE_UNUSED;
+md_create_short_jump (char *ptr, addressT from_addr,
+		      addressT to_addrATTRIBUTE_UNUSED,
+		      fragS *frag ATTRIBUTE_UNUSED,
+		      symbolS *to_symbol ATTRIBUTE_UNUSED)
 {
   valueT offset;
 
@@ -3238,12 +3209,8 @@
 }
 
 void
-md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
-     char *ptr;
-     addressT from_addr ATTRIBUTE_UNUSED;
-     addressT to_addr;
-     fragS *frag;
-     symbolS *to_symbol;
+md_create_long_jump (char *ptr, addressT from_addr ATTRIBUTE_UNUSED,
+		     addressT to_addr, fragS *frag, symbolS *to_symbol)
 {
   valueT offset;
 
@@ -3271,9 +3238,7 @@
 size_t md_longopts_size = sizeof (md_longopts);
 
 int
-md_parse_option (c, arg)
-     int c;
-     char *arg;
+md_parse_option (int c, char *arg)
 {
   switch (c)
     {
@@ -3348,8 +3313,7 @@
 }
 
 void
-md_show_usage (stream)
-     FILE *stream;
+md_show_usage (FILE *stream)
 {
   fprintf (stream, _("\
 VAX options:\n\
@@ -3374,17 +3338,14 @@
 /* We have no need to default values of symbols.  */
 
 symbolS *
-md_undefined_symbol (name)
-     char *name ATTRIBUTE_UNUSED;
+md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 /* Round up a section size to the appropriate boundary.  */
 valueT
-md_section_align (segment, size)
-     segT segment ATTRIBUTE_UNUSED;
-     valueT size;
+md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size)
 {
   return size;			/* Byte alignment is fine */
 }
@@ -3393,8 +3354,7 @@
    On the vax, they're relative to the address of the offset, plus
    its size. */
 long
-md_pcrel_from (fixP)
-     fixS *fixP;
+md_pcrel_from (fixS *fixP)
 {
   return fixP->fx_size + fixP->fx_where + fixP->fx_frag->fr_address;
 }
@@ -3402,8 +3362,7 @@
 #ifdef OBJ_AOUT
 #ifndef BFD_ASSEMBLER
 void
-tc_headers_hook(headers)
-     object_headers *headers;
+tc_headers_hook (object_headers *headers)
 {
 #ifdef TE_NetBSD
   N_SET_INFO(headers->header, OMAGIC, M_VAX4K_NETBSD, 0);
@@ -3415,9 +3374,7 @@
 
 #ifdef BFD_ASSEMBLER
 arelent *
-tc_gen_reloc (section, fixp)
-     asection *section ATTRIBUTE_UNUSED;
-     fixS *fixp;
+tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
 {
   arelent *reloc;
   bfd_reloc_code_real_type code;
--- binutils-HEAD/opcodes/vax-dis.c~	2004-06-30 21:39:17.000000000 +0200
+++ binutils-HEAD/opcodes/vax-dis.c	2004-06-30 21:42:17.000000000 +0200
@@ -21,11 +21,11 @@
 #include "dis-asm.h"
 
 /* Local function prototypes */
-static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+static int fetch_data (struct disassemble_info *, bfd_byte *);
 static int print_insn_arg
-  PARAMS ((const char *, unsigned char *, bfd_vma, disassemble_info *));
+  (const char *, unsigned char *, bfd_vma, disassemble_info *);
 static int print_insn_mode
-  PARAMS ((const char *, int, unsigned char *, bfd_vma, disassemble_info *));
+  (const char *, int, unsigned char *, bfd_vma, disassemble_info *);
 
 
 static char *reg_names[] =
@@ -80,9 +80,7 @@
    ? 1 : fetch_data ((info), (addr)))
 
 static int
-fetch_data (info, addr)
-     struct disassemble_info *info;
-     bfd_byte *addr;
+fetch_data (struct disassemble_info *info, bfd_byte *addr)
 {
   int status;
   struct private *priv = (struct private *) info->private_data;
@@ -107,9 +105,7 @@
    on INFO->STREAM.  Returns length of the instruction, in bytes.  */
 
 int
-print_insn_vax (memaddr, info)
-     bfd_vma memaddr;
-     disassemble_info *info;
+print_insn_vax (bfd_vma memaddr, disassemble_info *info)
 {
   const struct vot *votp;
   const char *argp;
@@ -187,11 +183,8 @@
    found. */
 
 static int
-print_insn_arg (d, p0, addr, info)
-     const char *d;
-     unsigned char *p0;
-     bfd_vma addr;		/* PC for this arg to be relative to */
-     disassemble_info *info;
+print_insn_arg (const char *d, unsigned char *p0, bfd_vma addr,
+		disassemble_info *info)
 {
   int arg_len;
 
@@ -227,12 +220,8 @@
 }
 
 static int
-print_insn_mode (d, size, p0, addr, info)
-     const char *d;
-     int size;
-     unsigned char *p0;
-     bfd_vma addr;		/* PC for this arg to be relative to */
-     disassemble_info *info;
+print_insn_mode (const char *d, int size, unsigned char *p0, bfd_vma addr,
+		 disassemble_info *info)
 {
   unsigned char *p = p0;
   unsigned char mode, reg;
--- binutils-HEAD/gas/config/tc-vax.c~	2004-07-05 16:44:01.000000000 +0200
+++ binutils-HEAD/gas/config/tc-vax.c	2004-07-05 16:45:33.000000000 +0200
@@ -294,7 +294,7 @@
 }
 
 void
-md_number_to_chars (char con[], valueT value, intnbytes)
+md_number_to_chars (char con[], valueT value, int nbytes)
 {
   number_to_chars_littleendian (con, value, nbytes);
 }
@@ -2084,7 +2084,7 @@
 #define SP (14)
 #define PC (15)
 
-/* 
+
 int				/* return -1 or 0:15 */
 vax_reg_parse (char c1, char c2, char c3, char c4)	/* 3 chars of register name */
 {
@@ -3193,7 +3193,7 @@
 
 void
 md_create_short_jump (char *ptr, addressT from_addr,
-		      addressT to_addrATTRIBUTE_UNUSED,
+		      addressT to_addr ATTRIBUTE_UNUSED,
 		      fragS *frag ATTRIBUTE_UNUSED,
 		      symbolS *to_symbol ATTRIBUTE_UNUSED)
 {
