[PATCH 11/13] Move common-utils.h to common-defs.h

Gary Benson
2014-07-29T15:18:24Z

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

gdb/
2014-07-28 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-07-28 Gary Benson <gbenson@redhat.com>

* 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 <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 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. */
--
1.7.1