From 4cb9c816469ef3373d9cdde76e8ab5007cf3739e Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Mon, 28 Jul 2014 14:28:06 +0100 Subject: [PATCH] Move ptid.h to common-defs.h This commit moves the inclusion of ptid.h to common-defs.h and removes all other inclusions. gdb/ 2014-08-07 Gary Benson * common/common-defs.h: Include ptid.h. * defs.h: Do not include ptid.h. * inferior.h: Likewise. * infrun.h: Likewise. * nat/linux-btrace.h: Likewise. * nat/linux-osdata.h: Likewise. * target/waitstatus.h: Likewise. gdb/gdbserver/ 2014-08-07 Gary Benson * server.h: Do not include ptid.h. * notif.h: Likewise. --- gdb/ChangeLog | 10 ++++++++++ gdb/common/common-defs.h | 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 - 11 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d99b321..86274e8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2014-08-07 Gary Benson + * common/common-defs.h: Include ptid.h. + * defs.h: Do not include ptid.h. + * inferior.h: Likewise. + * infrun.h: Likewise. + * nat/linux-btrace.h: Likewise. + * nat/linux-osdata.h: Likewise. + * target/waitstatus.h: Likewise. + +2014-08-07 Gary Benson + * common/common-defs.h: Include gdb_locale.h. * defs.h: Do not include gdb_locale.h. 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/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/ChangeLog b/gdb/gdbserver/ChangeLog index 5ca4ffa..b51d870 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2014-08-07 Gary Benson + * server.h: Do not include ptid.h. + * notif.h: Likewise. + +2014-08-07 Gary Benson + * server.h: Do not include gdb_locale.h. 2014-08-07 Gary Benson diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h index c6a790d..dab687f 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 "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. */ -- 2.7.4