From: Gary Benson <gbenson@redhat.com>
Date: Fri, 12 Sep 2014 09:11:42 +0000 (+0100)
Subject: Remove GDBSERVER uses from x86-dregs.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=296b1496f756d26b2e3235133f89012fff940902;p=binutils-gdb.git

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.
---

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  <gbenson@redhat.com>
+
+	* 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  <gbenson@redhat.com>
 
 	* 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 <http://www.gnu.org/licenses/>.  */
 
-#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.