From patchwork Wed Jul 16 14:17:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2088 Received: (qmail 1767 invoked by alias); 16 Jul 2014 17:03:19 -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 1740 invoked by uid 89); 16 Jul 2014 17:03:15 -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 17:03:14 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJarM012184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Jul 2014 12:19:37 -0400 Received: from blade.nx (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJZnv032421; Wed, 16 Jul 2014 12:19:35 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 4B3E42640CE; Wed, 16 Jul 2014 15:17:31 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Tom Tromey , Doug Evans Subject: [PATCH 08/15 v2] Make btrace-common.h not use GDBSERVER Date: Wed, 16 Jul 2014 15:17:16 +0100 Message-Id: <1405520243-17282-9-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 changes btrace-common.h not to include defs.h or server.h. Instead it moves the defs.h include to btrace.c. gdb/ 2014-07-16 Tom Tromey * btrace.c: Include defs.h. * common/btrace-common.h: Don't include server.h or defs.h. --- gdb/ChangeLog | 5 +++++ gdb/btrace.c | 1 + gdb/common/btrace-common.h | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/btrace.c b/gdb/btrace.c index 87a171e..b5c3c26 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "defs.h" #include "btrace.h" #include "gdbthread.h" #include "exceptions.h" diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h index 25617bb..339e684 100644 --- a/gdb/common/btrace-common.h +++ b/gdb/common/btrace-common.h @@ -26,12 +26,6 @@ inferior. For presentation purposes, the branch trace is represented as a list of sequential control-flow blocks, one such list per thread. */ -#ifdef GDBSERVER -# include "server.h" -#else -# include "defs.h" -#endif - #include "vec.h" /* A branch trace block.