[2/3] Include cleanups.h in common-defs.h

Message ID 1409586154-16196-3-git-send-email-gbenson@redhat.com
State Committed
Headers

Commit Message

Gary Benson Sept. 1, 2014, 3:42 p.m. UTC
  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.
---
 gdb/ChangeLog                  |    6 ++++++
 gdb/common/common-defs.h       |    1 +
 gdb/common/common-exceptions.c |    1 -
 gdb/gdbserver/ChangeLog        |    4 ++++
 gdb/gdbserver/server.h         |    1 -
 gdb/utils.h                    |    1 -
 6 files changed, 11 insertions(+), 3 deletions(-)
  

Comments

Pedro Alves Oct. 7, 2014, 6:05 p.m. UTC | #1
On 09/01/2014 04:42 PM, Gary Benson wrote:
> 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.

OK.

Thanks,
Pedro Alves
  

Patch

diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 2d3444b..ffcc4eb 100644
--- 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 c382d86..38216c8 100644
--- 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/server.h b/gdb/gdbserver/server.h
index 812f533..b76bb1d 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -126,6 +126,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 c1948eb..1568011 100644
--- 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);