From 9422fadb91c568a976414bef7ea91e5832eab334 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Sat, 20 Jul 1996 18:33:27 +0000 Subject: [PATCH] * dwarf2read.c (struct filenames): Change internal "struct file" to "struct fileinfo" to avoid conflict with "struct file" in on HPUX and Solaris. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2read.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bb030eb1677..4a26f00d84f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 20 10:41:06 1996 Fred Fish + + * dwarf2read.c (struct filenames): Change internal "struct file" + to "struct fileinfo" to avoid conflict with "struct file" in + on HPUX and Solaris. + Sat Jul 20 10:09:28 1996 Fred Fish * gdbtk.tcl (delete_expr): Unset corresponding element of diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 7e7891da5ba..9c0e95ab2bf 100644 --- 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 ( -- 2.30.2