From 296b1496f756d26b2e3235133f89012fff940902 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Fri, 12 Sep 2014 10:11:42 +0100 Subject: [PATCH] Remove GDBSERVER uses from x86-dregs.c This commit makes nat/x86-dregs.c include common-defs.h rather than defs.h or server.h. An extra header required including in order to support this change. gdb/ChangeLog: * nat/x86-dregs.c: Include common-defs.h and break-common.h. Don't include defs.h or server.h. --- gdb/ChangeLog | 5 +++++ gdb/nat/x86-dregs.c | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bb0a9e86b07..e2f33351aa9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-09-12 Gary Benson + + * nat/x86-dregs.c: Include common-defs.h and break-common.h. + Don't include defs.h or server.h. + 2014-09-12 Gary Benson * nat/linux-btrace.c: Include common-defs.h. diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c index c0d1e727735..e3a7fb42cc9 100644 --- a/gdb/nat/x86-dregs.c +++ b/gdb/nat/x86-dregs.c @@ -17,13 +17,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#include "inferior.h" -#endif +#include "common-defs.h" #include "x86-dregs.h" +#include "break-common.h" /* Support for hardware watchpoints and breakpoints using the x86 debug registers. -- 2.30.2