From 6f1947e8a206a2664506ee5a333f7c9d0af8cac8 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 8 Oct 2014 09:33:22 +0100 Subject: [PATCH] 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. --- 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(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 61ee15f9ff9..c0efb675355 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-10-08 Gary Benson + + * common/common-defs.h: Include cleanups.h. + * common/common-exceptions.c: Do not include cleanups.h. + * utils.h: Likewise. + 2014-10-08 Gary Benson * ada-lang.c: Do not include exceptions.h. diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index 2d3444bf40b..ffcc4eb6608 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 c382d8630be..38216c8a93d 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/ChangeLog b/gdb/gdbserver/ChangeLog index aa56dcec45e..b9d4059b8ed 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Gary Benson + + * server.h: Do not include cleanups.h. + 2014-09-30 James Hogan * 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 ed54f77136d..de3142f4a13 100644 --- 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 c1948eb652f..15680119f15 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); -- 2.30.2