From patchwork Wed Jul 16 14:17:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2087 Received: (qmail 11994 invoked by alias); 16 Jul 2014 16:48:22 -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 11906 invoked by uid 89); 16 Jul 2014 16:48:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 16 Jul 2014 16:48:19 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJaA5006108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Jul 2014 12:19:36 -0400 Received: from blade.nx (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJZHo003258; Wed, 16 Jul 2014 12:19:36 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id B15F02640D3; Wed, 16 Jul 2014 15:17:31 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Tom Tromey , Doug Evans Subject: [PATCH 13/15 v2] Finally remove GDBSERVER (mostly) from agent.c Date: Wed, 16 Jul 2014 15:17:21 +0100 Message-Id: <1405520243-17282-14-git-send-email-gbenson@redhat.com> In-Reply-To: <1405520243-17282-1-git-send-email-gbenson@redhat.com> References: <1405520243-17282-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This reduces the use of the GDBSERVER define in agent.c to deciding which gnulib header to include. gdb/ 2014-07-16 Tom Tromey Gary Benson * common/agent.c: Don't include defs.h or server.h; update includes. --- gdb/ChangeLog | 6 ++++++ gdb/common/agent.c | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gdb/common/agent.c b/gdb/common/agent.c index 798dd1d..0df4b19 100644 --- a/gdb/common/agent.c +++ b/gdb/common/agent.c @@ -17,15 +17,24 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include + #ifdef GDBSERVER -#include "server.h" +#include "build-gnulib-gdbserver/config.h" #else -#include "defs.h" -#include "target.h" -#include "infrun.h" -#include "objfiles.h" +#include "build-gnulib/config.h" #endif +#include + +#include "ptid.h" +#include "gdb_signals.h" +#include "target/waitstatus.h" +#include "common-types.h" +#include "target/target.h" +#include "target/symbol.h" +#include "common-debug.h" + #include #include