[PATCH 10/13] Move ptid.h to common-defs.h

[Gary Benson <gbenson@redhat.com>]

This commit moves the inclusion of ptid.h to common-defs.h and removes
all other inclusions.

gdb/
2014-07-28  Gary Benson  <gbenson@redhat.com>

	* 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  <gbenson@redhat.com>

	* 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 <http://www.gnu.org/licenses/>.  */
 
-#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 <stdint.h>
 
 #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.  */
-- 
1.7.1