From c01e28360d30a9dd750b8c27157a12c99d1a6188 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 10 May 2022 09:13:42 -0600 Subject: [PATCH] ODR warning for struct field_info This renames one of the instance of "struct field_info" to avoid an ODR warning. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395 --- gdb/rs6000-aix-tdep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c index ead03bf8819..867f21dc634 100644 --- a/gdb/rs6000-aix-tdep.c +++ b/gdb/rs6000-aix-tdep.c @@ -849,7 +849,7 @@ rs6000_aix_osabi_sniffer (bfd *abfd) /* A structure encoding the offset and size of a field within a struct. */ -struct field_info +struct ldinfo_field { int offset; int size; @@ -861,13 +861,13 @@ struct field_info struct ld_info_desc { - struct field_info ldinfo_next; - struct field_info ldinfo_fd; - struct field_info ldinfo_textorg; - struct field_info ldinfo_textsize; - struct field_info ldinfo_dataorg; - struct field_info ldinfo_datasize; - struct field_info ldinfo_filename; + struct ldinfo_field ldinfo_next; + struct ldinfo_field ldinfo_fd; + struct ldinfo_field ldinfo_textorg; + struct ldinfo_field ldinfo_textsize; + struct ldinfo_field ldinfo_dataorg; + struct ldinfo_field ldinfo_datasize; + struct ldinfo_field ldinfo_filename; }; /* The following data has been generated by compiling and running -- 2.30.2