From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by sourceware.org (Postfix) with ESMTPS id 9E31038515D1 for ; Wed, 18 May 2022 18:00:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9E31038515D1 Received: by mail-io1-xd29.google.com with SMTP id h85so3114875iof.12 for ; Wed, 18 May 2022 11:00:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ro3d1tEYoaP6E8JETOg2S+2xWI3jdoyRj8RaCoxJvbw=; b=AsOSEh3ivG2xAxq6JTmBA8iW2tETGI1ihMcN/B+8QbbkVgk6kR0JY0YSBeETnGzm/1 yIv6MjYTu8sW2irSHeci5lesfAOrtrtlQwiQ8yRahJOCPRDYDQ1/KYycZrJNBFgD8HSJ Zf7KaoxeMCgZ3mmwclhiHcR+G9+g+B/IU2XpNDYPsyEceLmUbUUHJ0j1OzTMQLIdZpFy 96s/8dKBAHhj660DLUzGx0I0iBpQd1oRBdBll4/Cuu09eIhwcvZBjlo16QZl6EnNiFfu Lyy+YP+lNnxPYw/R/wPTx7mrLGKtEqnZkPARlZgYwLBNoCCsBD09Ar+mvMkyer8e8zrA /ExQ== X-Gm-Message-State: AOAM530WTYK9LUgYQ7XzT0oDgZOwgEoYn/T4Kij3Srr5qtqivWP0NN6p MhVBwP8bLU5Xcu6Mb9IWV8eDDj5QDBD1Rw== X-Google-Smtp-Source: ABdhPJwZJGJdT1can9JtaIGWOpEWYzdDILI26A19qZf0gksnEtgDTPMizbcnMpw9d3Ja3+GiQCoUxg== X-Received: by 2002:a05:6602:15d0:b0:65a:a94e:8814 with SMTP id f16-20020a05660215d000b0065aa94e8814mr427929iow.11.1652896855948; Wed, 18 May 2022 11:00:55 -0700 (PDT) Received: from murgatroyd.Home (71-211-158-194.hlrn.qwest.net. [71.211.158.194]) by smtp.gmail.com with ESMTPSA id r4-20020a92d984000000b002cde6e352ffsm715083iln.73.2022.05.18.11.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 11:00:55 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 03/14] ODR warnings for struct nextfield Date: Wed, 18 May 2022 12:00:38 -0600 Message-Id: <20220518180049.2337257-4-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220518180049.2337257-1-tromey@adacore.com> References: <20220518180049.2337257-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2022 18:00:58 -0000 "struct nextfield" is defined in multiple places in GDB. This patch renames just the stabs one, leaving the DWARF one untouched. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395 --- gdb/stabsread.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 4fe2110a47f..ab74cee6487 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -61,9 +61,9 @@ int *this_object_header_files; int n_this_object_header_files; int n_allocated_this_object_header_files; -struct nextfield +struct stabs_nextfield { - struct nextfield *next; + struct stabs_nextfield *next; /* This is the raw visibility from the stab. It is not checked for being one of the visibilities we recognize, so code which @@ -87,7 +87,7 @@ struct next_fnfieldlist struct stab_field_info { - struct nextfield *list = nullptr; + struct stabs_nextfield *list = nullptr; struct next_fnfieldlist *fnlist = nullptr; auto_obstack obstack; @@ -2922,7 +2922,7 @@ read_struct_fields (struct stab_field_info *fip, const char **pp, struct type *type, struct objfile *objfile) { const char *p; - struct nextfield *newobj; + struct stabs_nextfield *newobj; /* We better set p right now, in case there are no fields at all... */ @@ -2938,7 +2938,7 @@ read_struct_fields (struct stab_field_info *fip, const char **pp, { STABS_CONTINUE (pp, objfile); /* Get space to record the next field's data. */ - newobj = OBSTACK_ZALLOC (&fip->obstack, struct nextfield); + newobj = OBSTACK_ZALLOC (&fip->obstack, struct stabs_nextfield); newobj->next = fip->list; fip->list = newobj; @@ -3019,7 +3019,7 @@ read_baseclasses (struct stab_field_info *fip, const char **pp, struct type *type, struct objfile *objfile) { int i; - struct nextfield *newobj; + struct stabs_nextfield *newobj; if (**pp != '!') { @@ -3059,7 +3059,7 @@ read_baseclasses (struct stab_field_info *fip, const char **pp, for (i = 0; i < TYPE_N_BASECLASSES (type); i++) { - newobj = OBSTACK_ZALLOC (&fip->obstack, struct nextfield); + newobj = OBSTACK_ZALLOC (&fip->obstack, struct stabs_nextfield); newobj->next = fip->list; fip->list = newobj; @@ -3245,7 +3245,7 @@ attach_fields_to_type (struct stab_field_info *fip, struct type *type, { int nfields = 0; int non_public_fields = 0; - struct nextfield *scan; + struct stabs_nextfield *scan; /* Count up the number of fields that we have, as well as taking note of whether or not there are any non-public fields, which requires us to -- 2.34.1