K&R compiler fixes

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cdc1b94..dfea4b8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+       K&R compiler fixes.
+       * dwarf2.c (concat_filename): Avoid string literal concatenation.
+       * ieee.c (ieee_get_symtab): Don't initialise union in struct.
+
 Mon Apr 17 19:14:36 2000  David Mosberger  <davidm@hpl.hp.com>
 
        * Makefile.am (BFD64_BACKENDS): Mention coff-ia64.lo.

diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 92397a2..1c02912 100644 (file)
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -700,8 +700,8 @@ concat_filename (table, file)
 
   if (file - 1 >= table->num_files)
     {
-      (*_bfd_error_handler) (_("Dwarf Error: mangled line number "
-                              "section (bad file number)."));
+      (*_bfd_error_handler)
+       (_("Dwarf Error: mangled line number section (bad file number)."));
       return "<unknown>";
     }
 

diff --git a/bfd/ieee.c b/bfd/ieee.c
index 82b3bac..71b967a 100644 (file)
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -1009,8 +1009,17 @@ ieee_get_symtab (abfd, location)
   ieee_symbol_type *symp;
   static bfd dummy_bfd;
   static asymbol empty_symbol =
-  /* the_bfd, name, value, attr, section */
-  {&dummy_bfd, " ieee empty", (symvalue) 0, BSF_DEBUGGING, bfd_abs_section_ptr, { 0 }};
+  {
+    &dummy_bfd,
+    " ieee empty",
+    (symvalue) 0,
+    BSF_DEBUGGING,
+    bfd_abs_section_ptr
+#ifdef __STDC__
+    /* K&R compilers can't initialise unions.  */
+    , { 0 }
+#endif
+  };
 
   if (abfd->symcount)
     {