From patchwork Fri Aug 29 13:51:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2590 Received: (qmail 23013 invoked by alias); 29 Aug 2014 13:52:47 -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 23004 invoked by uid 89); 29 Aug 2014 13:52:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_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; Fri, 29 Aug 2014 13:52:46 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7TDpn1h021773 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 29 Aug 2014 09:51:49 -0400 Received: from blade.nx (ovpn-116-113.ams2.redhat.com [10.36.116.113]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7TDpmCB019752; Fri, 29 Aug 2014 09:51:49 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 87D002640F1; Fri, 29 Aug 2014 14:51:44 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Pedro Alves , Doug Evans Subject: [PATCH 8/9 v7] Remove GDBSERVER uses from i386-dregs.c Date: Fri, 29 Aug 2014 14:51:38 +0100 Message-Id: <1409320299-6812-9-git-send-email-gbenson@redhat.com> In-Reply-To: <1409320299-6812-1-git-send-email-gbenson@redhat.com> References: <1409320299-6812-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit makes nat/i386-dregs.c include common-defs.h rather than defs.h or server.h. An extra header required including in order to support this change. This patch differs from the version I posted on August 1 (https://sourceware.org/ml/gdb-patches/2014-08/msg00011.html) in that a hack made unnecessary by patch 1 of this series has been removed. gdb/ChangeLog: * nat/i386-dregs.c: Include common-defs.h and break-common.h. Don't include defs.h or server.h. --- gdb/ChangeLog | 5 +++++ gdb/nat/i386-dregs.c | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c index 7afe09b..2f22299 100644 --- a/gdb/nat/i386-dregs.c +++ b/gdb/nat/i386-dregs.c @@ -17,13 +17,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#include "inferior.h" -#endif +#include "common-defs.h" #include "i386-dregs.h" +#include "break-common.h" /* Support for hardware watchpoints and breakpoints using the i386 debug registers.