* dwarf2read.c (struct filenames): Change internal "struct file"

	to "struct fileinfo" to avoid conflict with "struct file" in
	<sys/file.h> on HPUX and Solaris.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bb030eb1677aaf4138e6030876d0b7c23d6e5476..4a26f00d84f0eb7fd475cfe5052766d4fefc82b9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 20 10:41:06 1996  Fred Fish  <fnf@cygnus.com>
+
+       * dwarf2read.c (struct filenames): Change internal "struct file"
+       to "struct fileinfo" to avoid conflict with "struct file" in
+       <sys/file.h> on HPUX and Solaris.
+
 Sat Jul 20 10:09:28 1996  Fred Fish  <fnf@cygnus.com>
 
        * gdbtk.tcl (delete_expr): Unset corresponding element of

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 7e7891da5ba0d53d99be663fccf1590164d51760..9c0e95ab2bf93c4e9006e8a08212a7440b4303bb 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2658,7 +2658,7 @@ dwarf_attr (die, name)
 struct filenames
 {
   int num_files;
-  struct file
+  struct fileinfo
   {
     char *name;
     unsigned int dir;
@@ -2759,7 +2759,7 @@ dwarf_decode_lines (offset, abfd)
       if ((files.num_files % FILE_ALLOC_CHUNK) == 0)
        {
          files.files = xrealloc (files.files,
-           (files.num_files + FILE_ALLOC_CHUNK) * sizeof (struct file));
+           (files.num_files + FILE_ALLOC_CHUNK) * sizeof (struct fileinfo));
        }
       files.files[files.num_files].name = cur_file;
       files.files[files.num_files].dir = read_unsigned_leb128 (abfd,
@@ -2805,7 +2805,7 @@ dwarf_decode_lines (offset, abfd)
                  {
                    files.files = xrealloc (files.files,
                      (files.num_files + FILE_ALLOC_CHUNK)
-                       * sizeof (struct file));
+                       * sizeof (struct fileinfo));
                  }
                files.files[files.num_files].name = cur_file;
                files.files[files.num_files].dir = read_unsigned_leb128 (