From patchwork Tue Jul 29 14:37:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2216 Received: (qmail 24935 invoked by alias); 29 Jul 2014 15:18:24 -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 15661 invoked by uid 89); 29 Jul 2014 15:02:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 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; Tue, 29 Jul 2014 15:02:51 +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 s6TEbKgs005579 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 29 Jul 2014 10:37:21 -0400 Received: from blade.nx (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6TEbJ9W012256 for ; Tue, 29 Jul 2014 10:37:20 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 2310C2640E1 for ; Tue, 29 Jul 2014 15:37:18 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 11/13] Move common-utils.h to common-defs.h Date: Tue, 29 Jul 2014 15:37:13 +0100 Message-Id: <1406644635-1011-12-git-send-email-gbenson@redhat.com> In-Reply-To: <1406644635-1011-1-git-send-email-gbenson@redhat.com> References: <1406644635-1011-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit moves the inclusion of common-utils.h to common-defs.h and removes all other inclusions. gdb/ 2014-07-28 Gary Benson * common/common-defs.h: Include common-utils.h. * defs.h: Do not include common-utils.h. * common/gdb_assert.h: Likewise. * darwin-nat.h: Likewise. * nat/linux-btrace.c: Likewise. * target/waitstatus.h: Likewise. gdb/gdbserver/ 2014-07-28 Gary Benson * server.h: Do not include common-utils.h. --- gdb/ChangeLog | 9 +++++++++ gdb/common/common-defs.h | 1 + gdb/common/gdb_assert.h | 2 -- gdb/darwin-nat.h | 1 - gdb/defs.h | 2 -- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/server.h | 1 - gdb/nat/linux-btrace.c | 1 - gdb/target/waitstatus.h | 1 - 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index 7bf328a..6a031ec 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -37,5 +37,6 @@ #include "gdb/signals.h" #include "gdb_locale.h" #include "ptid.h" +#include "common-utils.h" #endif /* COMMON_DEFS_H */ diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h index 4869fc4..7b795d3 100644 --- a/gdb/common/gdb_assert.h +++ b/gdb/common/gdb_assert.h @@ -19,8 +19,6 @@ #ifndef GDB_ASSERT_H #define GDB_ASSERT_H -#include "common-utils.h" /* For FUNCTION_NAME. */ - /* A static assertion. This will cause a compile-time error if EXPR, which must be a compile-time constant, is false. */ diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h index 84f4be1..4f2bebb 100644 --- a/gdb/darwin-nat.h +++ b/gdb/darwin-nat.h @@ -18,7 +18,6 @@ #define __DARWIN_NAT_H__ #include -#include "common-utils.h" /* For FUNCTION_NAME. */ /* Describe the mach exception handling state for a task. This state is saved before being changed and restored when a process is detached. diff --git a/gdb/defs.h b/gdb/defs.h index 8513606..710298c 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -533,8 +533,6 @@ enum val_prettyformat extern int longest_to_int (LONGEST); -#include "common-utils.h" - /* * List of known OS ABIs. If you change this, make sure to update the table in osabi.c. */ enum gdb_osabi diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index ca2729c..5a3f335 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -131,7 +131,6 @@ extern int handle_target_event (int err, gdb_client_data client_data); #include "remote-utils.h" -#include "common-utils.h" #include "utils.h" #include "debug.h" diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c index 188220b..84de8a7 100644 --- a/gdb/nat/linux-btrace.c +++ b/gdb/nat/linux-btrace.c @@ -26,7 +26,6 @@ #endif #include "linux-btrace.h" -#include "common-utils.h" #include "gdb_assert.h" #include "regcache.h" #include "gdbthread.h" diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h index c05d651..f818d87 100644 --- a/gdb/target/waitstatus.h +++ b/gdb/target/waitstatus.h @@ -20,7 +20,6 @@ #ifndef WAITSTATUS_H #define WAITSTATUS_H -#include "common-utils.h" #include "gdb_signals.h" /* Stuff for target_wait. */