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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c0efb67535574b56681a9b20c1ec28715cac5af1..9b74d16c509d4fdefd1ad20648654bb88d40289b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index ffcc4eb6608a50dc18f19385d2a95583361b4067..29c8ab3039c425a41d694b6c1813084271962e75 100644 (file)
--- 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 00d2b6126c566ddec89eaa09a0e60ec095a1a4ec..f4d62a6c1313fbee1b6d9e9510da77050c657e6a 100644 (file)
--- 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 b9d4059b8ed533508d0daee5f24f3a250ef67b0c..ae028616f880536afcf87cac30f901fed7d24efe 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index de3142f4a13c8183913c13fa16cc52b9c9a54047..cac73e920180e237f076d9215f3ec191348407a5 100644 (file)
--- 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 */