* somread.c: Include "solib-som.h".

(som_symfile_init, som_new_init, som_symfile_read,
som_symfile_finish, som_symtab_read, som_symfile_offsets): Remove
redudant prototypes.
* Makefile.in (somread.o): Update dependencies.

gdb/ChangeLog

@@ -1,3 +1,11 @@
+2004-12-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* somread.c: Include "solib-som.h".
+	(som_symfile_init, som_new_init, som_symfile_read,
+	som_symfile_finish, som_symtab_read, som_symfile_offsets): Remove
+	redudant prototypes.
+	* Makefile.in (somread.o): Update dependencies.
+
 2004-12-17  Jim Blandy  <jimb@redhat.com>
 
 	* remote.c (fetch_register_using_p): Indentation cleanup.

gdb/Makefile.in

@@ -2515,7 +2515,8 @@ sol-thread.o: sol-thread.c $(defs_h) $(gdbthread_h) $(target_h) \
 	$(symfile_h) $(gdb_string_h) $(gregset_h)
 somread.o: somread.c $(defs_h) $(bfd_h) $(symtab_h) $(symfile_h) \
 	$(objfiles_h) $(buildsym_h) $(stabsread_h) $(gdb_stabs_h) \
-	$(complaints_h) $(gdb_string_h) $(demangle_h) $(som_h) $(libhppa_h)
+	$(complaints_h) $(gdb_string_h) $(demangle_h) $(som_h) $(libhppa_h) \
+	$(solib_som_h)
 solib-som.o: solib-som.c $(defs_h) $(som_h) $(symtab_h) $(bfd_h) $(symfile_h) \
 	$(objfiles_h) $(gdbcore_h) $(target_h) $(inferior_h) $(hppa_tdep_h) \
 	$(solist_h)

gdb/somread.c

@@ -35,23 +35,11 @@
 #include "som.h"
 #include "libhppa.h"
 
-/* Various things we might complain about... */
+#include "solib-som.h"
 
+/* Prototypes for local functions.  */
 static int init_import_symbols (struct objfile *objfile);
 
-static void som_symfile_init (struct objfile *);
-
-static void som_new_init (struct objfile *);
-
-static void som_symfile_read (struct objfile *, int);
-
-static void som_symfile_finish (struct objfile *);
-
-static void som_symtab_read (bfd *, struct objfile *,
-			     struct section_offsets *);
-
-static void som_symfile_offsets (struct objfile *, struct section_addr_info *);
-
 /* FIXME: These should really be in a common header somewhere */
 
 extern void hpread_build_psymtabs (struct objfile *, int);