From 462f517e5020a464e84d2b8535b1b68d39329dc2 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Thu, 31 Jul 2014 13:25:01 +0100 Subject: [PATCH] Do not include defs.h or server.h in any header file This commit removes all inclusions of defs.h and server.h from header files. gdb/ 2014-07-31 Gary Benson * common/btrace-common.h: Do not include defs.h or server.h. * nat/mips-linux-watch.h: Likewise. * gdb-dlfcn.h: Do not include defs.h. * tracefile.h: Likewise. gdb/gdbserver/ 2014-07-31 Gary Benson * ax.h: Do not include server.h. * gdbthread.h: Likewise. * lynx-low.h: Likewise. * notif.h: Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/common/btrace-common.h | 6 ------ gdb/gdb-dlfcn.h | 2 -- gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/ax.h | 1 - gdb/gdbserver/gdbthread.h | 1 - gdb/gdbserver/lynx-low.h | 2 -- gdb/gdbserver/notif.h | 1 - gdb/nat/mips-linux-watch.h | 6 ------ gdb/tracefile.h | 1 - 10 files changed, 14 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index efba7862888..572cd44a299 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-07-31 Gary Benson + + * common/btrace-common.h: Do not include defs.h or server.h. + * nat/mips-linux-watch.h: Likewise. + * gdb-dlfcn.h: Do not include defs.h. + * tracefile.h: Likewise. + 2014-07-30 Roland McGrath * remote-sim.c (gdbsim_open): Apply constification to forward decl. diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h index 25617bbc988..339e68430a9 100644 --- a/gdb/common/btrace-common.h +++ b/gdb/common/btrace-common.h @@ -26,12 +26,6 @@ inferior. For presentation purposes, the branch trace is represented as a list of sequential control-flow blocks, one such list per thread. */ -#ifdef GDBSERVER -# include "server.h" -#else -# include "defs.h" -#endif - #include "vec.h" /* A branch trace block. diff --git a/gdb/gdb-dlfcn.h b/gdb/gdb-dlfcn.h index afc1a25016f..905015a042f 100644 --- a/gdb/gdb-dlfcn.h +++ b/gdb/gdb-dlfcn.h @@ -20,8 +20,6 @@ #ifndef GDB_DLFCN_H #define GDB_DLFCN_H -#include "defs.h" - /* Load the dynamic library file named FILENAME, and return a handle for that dynamic library. Return NULL if the loading fails for any reason. */ diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index d0fa61d44be..8874790107d 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2014-07-31 Gary Benson + + * ax.h: Do not include server.h. + * gdbthread.h: Likewise. + * lynx-low.h: Likewise. + * notif.h: Likewise. + 2014-07-30 Gary Benson * server.h: Include common-defs.h. diff --git a/gdb/gdbserver/ax.h b/gdb/gdbserver/ax.h index 63180042600..59005e05a50 100644 --- a/gdb/gdbserver/ax.h +++ b/gdb/gdbserver/ax.h @@ -19,7 +19,6 @@ #if !defined (AX_H) #define AX_H 1 -#include "server.h" #include "regcache.h" #ifdef IN_PROCESS_AGENT diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h index 9785d67a52c..fe0a75e44d8 100644 --- a/gdb/gdbserver/gdbthread.h +++ b/gdb/gdbserver/gdbthread.h @@ -19,7 +19,6 @@ #ifndef GDB_THREAD_H #define GDB_THREAD_H -#include "server.h" #include "inferiors.h" struct btrace_target_info; diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h index 94a079ebb9b..966ec0378c3 100644 --- a/gdb/gdbserver/lynx-low.h +++ b/gdb/gdbserver/lynx-low.h @@ -15,8 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "server.h" - struct regcache; struct target_desc; diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h index 3d233a1201b..c6a790da183 100644 --- a/gdb/gdbserver/notif.h +++ b/gdb/gdbserver/notif.h @@ -17,7 +17,6 @@ along with this program. If not, see . */ #include "ptid.h" -#include "server.h" #include "target.h" #include "queue.h" diff --git a/gdb/nat/mips-linux-watch.h b/gdb/nat/mips-linux-watch.h index c9f69322b32..09921025f6f 100644 --- a/gdb/nat/mips-linux-watch.h +++ b/gdb/nat/mips-linux-watch.h @@ -18,12 +18,6 @@ #ifndef MIPS_LINUX_WATCH_H #define MIPS_LINUX_WATCH_H 1 -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - #include #include diff --git a/gdb/tracefile.h b/gdb/tracefile.h index 54853708291..8b711a115c2 100644 --- a/gdb/tracefile.h +++ b/gdb/tracefile.h @@ -1,7 +1,6 @@ #ifndef TRACEFILE_H #define TRACEFILE_H 1 -#include "defs.h" #include "tracepoint.h" struct trace_file_writer; -- 2.30.2