-/* XXX - FIXME. offsetof belongs in the system-specific files in
- ../include/sys. */
-/* Define offsetof for those systems which lack it */
-
-#ifndef offsetof
-#define offsetof(type, identifier) (size_t) &(((type *) 0)->identifier)
-#endif
-
-static boolean oasys_read_record PARAMS ((bfd *,
- oasys_record_union_type *));
-static boolean oasys_write_sections PARAMS ((bfd *));
-static boolean oasys_write_record PARAMS ((bfd *,
- oasys_record_enum_type,
- oasys_record_union_type *,
- size_t));
-static boolean oasys_write_syms PARAMS ((bfd *));
-static boolean oasys_write_header PARAMS ((bfd *));
-static boolean oasys_write_end PARAMS ((bfd *));
-static boolean oasys_write_data PARAMS ((bfd *));
-
-/* Read in all the section data and relocation stuff too */
-PROTO (static boolean, oasys_slurp_section_data, (bfd * CONST abfd));
-
-static boolean
+static bfd_boolean oasys_slurp_section_data
+ PARAMS ((bfd * const));
+static bfd_boolean oasys_read_record
+ PARAMS ((bfd *, oasys_record_union_type *));
+static bfd_boolean oasys_write_sections
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_record
+ PARAMS ((bfd *, oasys_record_enum_type, oasys_record_union_type *, size_t));
+static bfd_boolean oasys_write_syms
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_header
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_end
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_data
+ PARAMS ((bfd *));
+static size_t oasys_string_length
+ PARAMS ((oasys_record_union_type *));
+static bfd_boolean oasys_slurp_symbol_table
+ PARAMS ((bfd *const));
+static long int oasys_get_symtab_upper_bound
+ PARAMS ((bfd *const));
+static const bfd_target *oasys_archive_p
+ PARAMS ((bfd *));
+static bfd_boolean oasys_mkobject
+ PARAMS ((bfd *));
+static const bfd_target *oasys_object_p
+ PARAMS ((bfd *));
+static void oasys_get_symbol_info
+ PARAMS ((bfd *, asymbol *, symbol_info *));
+static void oasys_print_symbol
+ PARAMS ((bfd *, void *, asymbol *, bfd_print_symbol_type));
+static bfd_boolean oasys_new_section_hook
+ PARAMS ((bfd *, asection *));
+static long int oasys_get_reloc_upper_bound
+ PARAMS ((bfd *, sec_ptr));
+static bfd_boolean oasys_get_section_contents
+ PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
+static int comp
+ PARAMS ((const void *, const void *));
+static bfd_boolean oasys_write_object_contents
+ PARAMS ((bfd *));
+static bfd_boolean oasys_set_section_contents
+ PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
+static asymbol *oasys_make_empty_symbol
+ PARAMS ((bfd *));
+static bfd *oasys_openr_next_archived_file
+ PARAMS ((bfd *, bfd *));
+static bfd_boolean oasys_find_nearest_line
+ PARAMS ((bfd *, asection *, asymbol **, bfd_vma,
+ const char **, const char **, unsigned int *));
+static int oasys_generic_stat_arch_elt
+ PARAMS ((bfd *, struct stat *));
+static int oasys_sizeof_headers
+ PARAMS ((bfd *, bfd_boolean));
+
+long oasys_canonicalize_symtab
+ PARAMS ((bfd *, asymbol **));
+long oasys_canonicalize_reloc
+ PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
+/* Read in all the section data and relocation stuff too. */
+
+static bfd_boolean