aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorFred Fish <fnf@specifix.com>1996-07-20 18:33:27 +0000
committerFred Fish <fnf@specifix.com>1996-07-20 18:33:27 +0000
commit9422fadb91c568a976414bef7ea91e5832eab334 (patch)
tree7be42b4ce84d571ec87765720557147fecd27d0d /gdb
parentefd14e4595e06eb83df1a858e8ba19e33f8e9f83 (diff)
downloadgdb-9422fadb91c568a976414bef7ea91e5832eab334.zip
gdb-9422fadb91c568a976414bef7ea91e5832eab334.tar.gz
gdb-9422fadb91c568a976414bef7ea91e5832eab334.tar.bz2
* 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.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/dwarf2read.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bb030eb..4a26f00 100644
--- 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 7e7891d..9c0e95a 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 (