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 c0efb67..9b74d16 100644 (file)
--- 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 ffcc4eb..29c8ab3 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 00d2b61..f4d62a6 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 b9d4059..ae02861 100644 (file)
--- 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 de3142f..cac73e9 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 */