From patchwork Tue Jul 29 14:37:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2221 Received: (qmail 10509 invoked by alias); 29 Jul 2014 16:09:18 -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 2200 invoked by uid 89); 29 Jul 2014 15:33:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 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:33: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 s6TEbKTh028295 (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-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6TEbJd4018016 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 104472640E0 for ; Tue, 29 Jul 2014 15:37:18 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 10/13] Move ptid.h to common-defs.h Date: Tue, 29 Jul 2014 15:37:12 +0100 Message-Id: <1406644635-1011-11-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 ptid.h to common-defs.h and removes all other inclusions. gdb/ 2014-07-28 Gary Benson * common/common-defs.h: Include ptid.h. * defs.h: Do not include ptid.h. * common/ptid.c: Likewise. * inferior.h: Likewise. * infrun.h: Likewise. * nat/linux-btrace.h: Likewise. * nat/linux-osdata.h: Likewise. * target/waitstatus.h: Likewise. gdb/gdbserver/ 2014-07-28 Gary Benson * server.h: Do not include ptid.h. * notif.h: Likewise. --- gdb/ChangeLog | 11 +++++++++++ gdb/common/common-defs.h | 1 + gdb/common/ptid.c | 1 - gdb/defs.h | 2 -- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/notif.h | 1 - gdb/gdbserver/server.h | 1 - gdb/inferior.h | 2 -- gdb/infrun.h | 1 - gdb/nat/linux-btrace.h | 1 - gdb/nat/linux-osdata.h | 2 -- gdb/target/waitstatus.h | 1 - 12 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index c0fbb0d..7bf328a 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -36,5 +36,6 @@ #include "pathmax.h" #include "gdb/signals.h" #include "gdb_locale.h" +#include "ptid.h" #endif /* COMMON_DEFS_H */ diff --git a/gdb/common/ptid.c b/gdb/common/ptid.c index 04fd118..48e76ca 100644 --- a/gdb/common/ptid.c +++ b/gdb/common/ptid.c @@ -22,7 +22,6 @@ #else #include "defs.h" #endif -#include "ptid.h" /* See ptid.h for these. */ diff --git a/gdb/defs.h b/gdb/defs.h index 23f875e..8513606 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -113,8 +113,6 @@ typedef bfd_vma CORE_ADDR; #define max(a, b) ((a) > (b) ? (a) : (b)) #endif -#include "ptid.h" - /* * Enable xdb commands if set. */ extern int xdb_commands; diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h index 3d233a1..1fc802c 100644 --- a/gdb/gdbserver/notif.h +++ b/gdb/gdbserver/notif.h @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "ptid.h" #include "server.h" #include "target.h" #include "queue.h" diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 7c0b80a..ca2729c 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -71,7 +71,6 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap); /* A type used for binary buffers. */ typedef unsigned char gdb_byte; -#include "ptid.h" #include "buffer.h" #include "xml-utils.h" diff --git a/gdb/inferior.h b/gdb/inferior.h index 668c888..afc29e2 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -31,8 +31,6 @@ struct ui_out; struct terminal_info; struct target_desc_info; -#include "ptid.h" - /* For bpstat. */ #include "breakpoint.h" diff --git a/gdb/infrun.h b/gdb/infrun.h index 35b2246..cc9cb33 100644 --- a/gdb/infrun.h +++ b/gdb/infrun.h @@ -18,7 +18,6 @@ #ifndef INFRUN_H #define INFRUN_H 1 -#include "ptid.h" #include "symtab.h" struct target_waitstatus; diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h index 5faf535..28a7176 100644 --- a/gdb/nat/linux-btrace.h +++ b/gdb/nat/linux-btrace.h @@ -24,7 +24,6 @@ #include "btrace-common.h" #include "vec.h" -#include "ptid.h" #include #if HAVE_LINUX_PERF_EVENT_H diff --git a/gdb/nat/linux-osdata.h b/gdb/nat/linux-osdata.h index e9d4f3c..252f3c9 100644 --- a/gdb/nat/linux-osdata.h +++ b/gdb/nat/linux-osdata.h @@ -20,8 +20,6 @@ #ifndef COMMON_LINUX_OSDATA_H #define COMMON_LINUX_OSDATA_H -#include "ptid.h" - extern int linux_common_core_of_thread (ptid_t ptid); extern LONGEST linux_common_xfer_osdata (const char *annex, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h index 32eb5a4..c05d651 100644 --- a/gdb/target/waitstatus.h +++ b/gdb/target/waitstatus.h @@ -21,7 +21,6 @@ #define WAITSTATUS_H #include "common-utils.h" -#include "ptid.h" #include "gdb_signals.h" /* Stuff for target_wait. */