* f-lang.c: Remove duplicate declaration of

builtin_type_f_integer, and only include it in the f_builtin_types
	once.

	* somread.c (som_symfile_read): Just assign to objfile->obj_private,
	not OBJ_UNWIND_INFO.  Assigning to a cast is a GCC-ism which
	the HP compiler doesn't like.

gdb/somread.c

@@ -349,7 +349,7 @@ som_symfile_read (objfile, section_offsets, mainline)
   install_minimal_symbols (objfile);
 
   /* Force hppa-tdep.c to re-read the unwind descriptors.  */
-  OBJ_UNWIND_INFO (objfile) = NULL;
+  objfile->obj_private = NULL;
   do_cleanups (back_to);
 }