Include cleanups.h in common-defs.h

This commit includes cleanups.h in common-defs.h and removes all other
inclusions.

gdb/ChangeLog:

	* common/common-defs.h: Include cleanups.h.
	* common/common-exceptions.c: Do not include cleanups.h.
	* utils.h: Likewise.

gdb/gdbserver/ChangeLog:

	* server.h: Do not include cleanups.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 61ee15f9ff908f96f9de26d43bb88bccbd81d87a..c0efb67535574b56681a9b20c1ec28715cac5af1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2014-10-08  Gary Benson  <gbenson@redhat.com>
 
        * ada-lang.c: Do not include exceptions.h.

diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 2d3444bf40bf787b4d86968dc522437b181454be..ffcc4eb6608a50dc18f19385d2a95583361b4067 100644 (file)
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -45,5 +45,6 @@
 #include "common-types.h"
 #include "print-utils.h"
 #include "common-debug.h"
+#include "cleanups.h"
 
 #endif /* COMMON_DEFS_H */

diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c
index c382d8630bef4f5e742a062942312ef63406d692..38216c8a93dcddb4b56a5fd5bb01b97bf3bc26fe 100644 (file)
--- a/gdb/common/common-exceptions.c
+++ b/gdb/common/common-exceptions.c
@@ -19,7 +19,6 @@
 
 #include "common-defs.h"
 #include "common-exceptions.h"
-#include "cleanups.h"
 
 /* Possible catcher states.  */
 enum catcher_state {

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index aa56dcec45eac4ea098eb3403a4b22cee86f883a..b9d4059b8ed533508d0daee5f24f3a250ef67b0c 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 cleanups.h.
+
 2014-09-30  James Hogan  <james.hogan@imgtec.com>
 
        * Makefile.in (clean): Add rm -f commands for mips-dsp-linux.c and

diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index ed54f77136dd6210b1bf287dbd8b936d14079c8e..de3142f4a13c8183913c13fa16cc52b9c9a54047 100644 (file)
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -125,6 +125,5 @@ extern int handle_target_event (int err, gdb_client_data client_data);
 #define PBUFSIZ 16384
 
 #include "common-exceptions.h"
-#include "cleanups.h"
 
 #endif /* SERVER_H */

diff --git a/gdb/utils.h b/gdb/utils.h
index c1948eb652fd1fb0ac794dd0e62a8576542f2c7c..15680119f15f0f04ceb69d63043b61431b803754 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -21,7 +21,6 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include "cleanups.h"
 #include "exceptions.h"
 
 extern void initialize_utils (void);