Move common-utils.h to common-defs.h

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

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

	* 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-08-07  Gary Benson  <gbenson@redhat.com>

	* server.h: Do not include common-utils.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 86274e886a387c67e73ecfdbb4405df035a292df..d5068b2fad5bcc1af07109b7f52cbb5d0da6365e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+       * 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.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
        * common/common-defs.h: Include ptid.h.

diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 7bf328a964578be2afff8d3ac753206ebaea3094..6a031ecee4abb77b97cb5959b3313a61a4308ef3 100644 (file)
--- 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 4869fc45d408d3008fd8e4e73abeeacc04438fe5..7b795d3c18f8b141199a98f5fc12262c6e0b1a63 100644 (file)
--- 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 84f4be1413af9808e6dbd0ee95eeaa742368647b..4f2bebbcf1ae28a0fb316588b39dd3a402a9d9fd 100644 (file)
--- a/gdb/darwin-nat.h
+++ b/gdb/darwin-nat.h
@@ -18,7 +18,6 @@
 #define __DARWIN_NAT_H__
 
 #include <mach/mach.h>
-#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 8513606c2765ad1412953db8d78d37ac740e1f17..710298c627de83252b8b9e8a9753f82303583e51 100644 (file)
--- 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/ChangeLog b/gdb/gdbserver/ChangeLog
index b51d87092c0e3c309e20c0496ee9c4f0022a6afd..a43ddcd69cc1fde0b3fcf27ea11a5c5f707799fc 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+       * server.h: Do not include common-utils.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
        * server.h: Do not include ptid.h.

diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index ca2729c350f77840de3fd00667b3abf5f9f0b291..5a3f335bc68af73db7ab3fb6c0b7afd4acc0f802 100644 (file)
--- 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 188220b651a80a3ffe87a5406e3540f85c24d13a..84de8a70a9204089e862e5a7d7e6671c96c10dc9 100644 (file)
--- 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 c05d651124860479462a2510320579be7765972f..f818d87e53378f167552d000d0b4a1156b66838f 100644 (file)
--- 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.  */