From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id B6202395A07B; Thu, 2 Jun 2022 15:29:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B6202395A07B Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] ODR warning for struct field_info X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 7e9d9756db9e4243a219d8837f2691572bcd5819 X-Git-Newrev: c01e28360d30a9dd750b8c27157a12c99d1a6188 Message-Id: <20220602152908.B6202395A07B@sourceware.org> Date: Thu, 2 Jun 2022 15:29:08 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 15:29:08 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc01e28360d30= a9dd750b8c27157a12c99d1a6188 commit c01e28360d30a9dd750b8c27157a12c99d1a6188 Author: Tom Tromey Date: Tue May 10 09:13:42 2022 -0600 ODR warning for struct field_info =20 This renames one of the instance of "struct field_info" to avoid an ODR warning. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D22395 Diff: --- 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. */ =20 -struct field_info +struct ldinfo_field { int offset; int size; @@ -861,13 +861,13 @@ struct field_info =20 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; }; =20 /* The following data has been generated by compiling and running