From patchwork Thu Oct 19 13:27:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 23684 Received: (qmail 67768 invoked by alias); 19 Oct 2017 13:27:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 67710 invoked by uid 89); 19 Oct 2017 13:27:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-wm0-f65.google.com Received: from mail-wm0-f65.google.com (HELO mail-wm0-f65.google.com) (74.125.82.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Oct 2017 13:27:15 +0000 Received: by mail-wm0-f65.google.com with SMTP id i124so16394110wmf.3 for ; Thu, 19 Oct 2017 06:27:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=oythVe/KAoVBbLC5y8G0TLUha196SDDaYC9M+aCjqRc=; b=pMOkSWJD2YnEM5NgLKWNx88gCtDuZUF36QoU6B3XzXG6pHuTnTpGbCIk1lkFVHchZm TsqU/xfUcRvqOqkNx4Ap7koyIIg1Eo7f9IRMiCVh4q6kXKRfma7D7lp+4U2vIj2EeGF0 tjS247NgRBhDZiIf7qvjbn1qBZe37hEEb83u8Pyc1TwUD8BdQV/+8bhw775JbSTWv/oi X8pq2CXrAincoDIg5SfnS+BCG5zoz/EASQ9AuGelv0I/uWSTg9N02Ffk5AGm3W+VFBhr JFB721URKftfdz4rQYyENyATTW/N7+EvoiGgfrRSVG+SBiQJbY1MEHjAcRm2xNoIXICt /HOw== X-Gm-Message-State: AMCzsaXk0nXDj8Ki1d6Pl3S+LX1VH8KVgWRXEfB9ZOi6hk/DfFvj+bqD PYx/dgIhBvTiPZHxemDbc8aWiDDy X-Google-Smtp-Source: ABhQp+R5m83m9owuKETnnCITIP1kdtWto2cJ8I/6eV4hbodJkTACyouhvx9AtLjoWbaCa1KGRiIOxw== X-Received: by 10.28.155.145 with SMTP id d139mr1648629wme.119.1508419633070; Thu, 19 Oct 2017 06:27:13 -0700 (PDT) Received: from localhost (host86-135-253-165.range86-135.btcentralplus.com. [86.135.253.165]) by smtp.gmail.com with ESMTPSA id w126sm1630988wme.25.2017.10.19.06.27.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2017 06:27:12 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: donb@codesourcery.com, Andrew Burgess Subject: [PATCHv4 1/5] gdb: Remove duplicate declaration of a function Date: Thu, 19 Oct 2017 14:27:05 +0100 Message-Id: <2677012b106ea6d716c7f6baf9388fe3d3772402.1508418720.git.andrew.burgess@embecosm.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes A function is declared in two header files. Remove the extra declaration, and add an include of the correct header into the one place this seems cause an issue. gdb/ChangeLog: * expression.h (innermost_block): Remove declaration. * varobj.c: Add 'parser-defs.h' include. --- gdb/ChangeLog | 5 +++++ gdb/expression.h | 5 ----- gdb/varobj.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/expression.h b/gdb/expression.h index 9e4ddf5ded..396ddf776a 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -113,11 +113,6 @@ extern expression_up parse_exp_1 (const char **, CORE_ADDR pc, attempt completion. */ extern int parse_completion; -/* The innermost context required by the stack and register variables - we've encountered so far. To use this, set it to NULL, then call - parse_, then look at it. */ -extern const struct block *innermost_block; - /* From eval.c */ /* Values of NOSIDE argument to eval_subexp. */ diff --git a/gdb/varobj.c b/gdb/varobj.c index 2d850fb5e1..f2232888c4 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -30,6 +30,7 @@ #include "gdbthread.h" #include "inferior.h" #include "varobj-iter.h" +#include "parser-defs.h" #if HAVE_PYTHON #include "python/python.h"