summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Benson <gbenson@redhat.com>2014-10-08 09:33:22 +0100
committerGary Benson <gbenson@redhat.com>2014-10-08 09:33:22 +0100
commita442d0713a940326c72c1c85357cb92d5f6d2fc2 (patch)
treee92ceda6d3e91d356a02924b93216e73f5c1dcc6
parent6f1947e8a206a2664506ee5a333f7c9d0af8cac8 (diff)
Include common-exceptions.h in common-defs.h
This commit includes common-exceptions.h in common-defs.h and removes all other inclusions. gdb/ChangeLog: * common/common-defs.h: Include common-exceptions.h. * exceptions.h: Do not include common-exceptions.h. gdb/gdbserver/ChangeLog: * server.h: Do not include common-exceptions.h.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/common/common-defs.h1
-rw-r--r--gdb/exceptions.h1
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/gdbserver/server.h2
5 files changed, 10 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c0efb67535..9b74d16c50 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2014-10-08 Gary Benson <gbenson@redhat.com>
+ * common/common-defs.h: Include common-exceptions.h.
+ * exceptions.h: Do not include common-exceptions.h.
+
+2014-10-08 Gary Benson <gbenson@redhat.com>
+
* common/common-defs.h: Include cleanups.h.
* common/common-exceptions.c: Do not include cleanups.h.
* utils.h: Likewise.
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index ffcc4eb660..29c8ab3039 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -46,5 +46,6 @@
#include "print-utils.h"
#include "common-debug.h"
#include "cleanups.h"
+#include "common-exceptions.h"
#endif /* COMMON_DEFS_H */
diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index 00d2b6126c..f4d62a6c13 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -20,7 +20,6 @@
#ifndef EXCEPTIONS_H
#define EXCEPTIONS_H
-#include "common-exceptions.h"
#include "ui-out.h"
/* A pre-defined non-exception. */
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b9d4059b8e..ae028616f8 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,9 @@
2014-10-08 Gary Benson <gbenson@redhat.com>
+ * server.h: Do not include common-exceptions.h.
+
+2014-10-08 Gary Benson <gbenson@redhat.com>
+
* server.h: Do not include cleanups.h.
2014-09-30 James Hogan <james.hogan@imgtec.com>
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index de3142f4a1..cac73e9201 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -124,6 +124,4 @@ extern int handle_target_event (int err, gdb_client_data client_data);
as large as the largest register set supported by gdbserver. */
#define PBUFSIZ 16384
-#include "common-exceptions.h"
-
#endif /* SERVER_H */