From a442d0713a940326c72c1c85357cb92d5f6d2fc2 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 8 Oct 2014 09:33:22 +0100 Subject: [PATCH] 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. --- gdb/ChangeLog | 5 +++++ gdb/common/common-defs.h | 1 + gdb/exceptions.h | 1 - gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/server.h | 2 -- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c0efb675355..9b74d16c509 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-10-08 Gary Benson + + * common/common-defs.h: Include common-exceptions.h. + * exceptions.h: Do not include common-exceptions.h. + 2014-10-08 Gary Benson * common/common-defs.h: Include cleanups.h. diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index ffcc4eb6608..29c8ab3039c 100644 --- 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 00d2b6126c5..f4d62a6c131 100644 --- 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 b9d4059b8ed..ae028616f88 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Gary Benson + + * server.h: Do not include common-exceptions.h. + 2014-10-08 Gary Benson * server.h: Do not include cleanups.h. diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index de3142f4a13..cac73e92018 100644 --- 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 */ -- 2.30.2