[PATCH 8/9 v7] Remove GDBSERVER uses from i386-dregs.c

Gary Benson
2014-08-29T13:52:47Z

This commit makes nat/i386-dregs.c include common-defs.h rather than
defs.h or server.h. An extra header required including in order to
support this change.

This patch differs from the version I posted on August 1
(https://sourceware.org/ml/gdb-patches/2014-08/msg00011.html)
in that a hack made unnecessary by patch 1 of this series has
been removed.

gdb/ChangeLog:

* nat/i386-dregs.c: Include common-defs.h and break-common.h.
Don't include defs.h or server.h.
---
gdb/ChangeLog | 5 +++++
gdb/nat/i386-dregs.c | 8 ++------
2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c
index 7afe09b..2f22299 100644
--- a/gdb/nat/i386-dregs.c
+++ b/gdb/nat/i386-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 "i386-dregs.h"
+#include "break-common.h"

/* Support for hardware watchpoints and breakpoints using the i386
debug registers.
--
1.7.1