This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 07/15 v2] Remove GDBSERVER use from nat/i386-dregs.c
- From: Gary Benson <gbenson at redhat dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tromey at redhat dot com>, Doug Evans <dje at google dot com>
- Date: Wed, 16 Jul 2014 15:17:15 +0100
- Subject: [PATCH 07/15 v2] Remove GDBSERVER use from nat/i386-dregs.c
- Authentication-results: sourceware.org; auth=none
- References: <1405520243-17282-1-git-send-email-gbenson at redhat dot com>
This removes the use of GDBSERVER from nat/i386-dregs.c. Neither
defs.h or server.h are included: the specific files required are
listed instead. Also, a declaration previously made only outside
of gdbserver is made unconditional.
gdb/
2014-07-16 Gary Benson <gbenson@redhat.com>
* gdb/nat/i386-dregs.c: Don't include server.h or defs.h; update
includes.
(debug_hw_points): Declare regardless of GDBSERVER.
---
gdb/ChangeLog | 6 ++++++
gdb/nat/i386-dregs.c | 17 +++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c
index e3272cd..d43fbcf 100644
--- a/gdb/nat/i386-dregs.c
+++ b/gdb/nat/i386-dregs.c
@@ -17,12 +17,15 @@
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 "config.h"
+#include "common-utils.h"
+#include "common-types.h"
+#include "break-common.h"
+#include "common-debug.h"
+#include "print-utils.h"
+#include "errors.h"
+#include "gdb_locale.h"
+#include "gdb_assert.h"
#include "i386-dregs.h"
/* Support for hardware watchpoints and breakpoints using the i386
@@ -175,10 +178,8 @@
/* Types of operations supported by i386_handle_nonaligned_watchpoint. */
typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t;
-#ifndef GDBSERVER
/* Whether or not to print the mirrored debug registers. */
extern int debug_hw_points;
-#endif
/* Print the values of the mirrored debug registers. */
--
1.7.1