From 7cbc3b0a3b16cbfbfc0bdb3f0bae730742d5d12c Mon Sep 17 00:00:00 2001
From: cgf <cgf>
Date: Sat, 13 Sep 2003 02:26:41 +0000
Subject: [PATCH] * win32-nat.c: Reorganize so that defines used by target
 headers are actually defined by the system headers. *
 config/i386/tm-cygwin.h: Check for CONTEXT_EXTENDED_REGISTERS rather than
 HAVE_CONTEXT_EXTENDED_REGISTERS, since the latter actually exists.

---
 gdb/ChangeLog               |  7 +++++++
 gdb/config/i386/tm-cygwin.h |  2 +-
 gdb/win32-nat.c             | 14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 48e36c9c0c..973472074b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-12  Christopher Faylor  <cgf@redhat.com>
+
+	* win32-nat.c: Reorganize so that defines used by target headers are
+	actually defined by the system headers.
+	* config/i386/tm-cygwin.h: Check for CONTEXT_EXTENDED_REGISTERS rather
+	than HAVE_CONTEXT_EXTENDED_REGISTERS, since the latter actually exists.
+
 2003-09-12  Jim Blandy  <jimb@redhat.com>
 
 	* dbxread.c (read_dbx_symtab): Don't report an internal error if
diff --git a/gdb/config/i386/tm-cygwin.h b/gdb/config/i386/tm-cygwin.h
index f30c432914..935966d46b 100644
--- a/gdb/config/i386/tm-cygwin.h
+++ b/gdb/config/i386/tm-cygwin.h
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Use SSE registers if winnt.h contains information about them.  */
-#ifdef HAVE_CONTEXT_EXTENDED_REGISTERS
+#ifdef CONTEXT_EXTENDED_REGISTERS
 #define HAVE_SSE_REGS
 #else
 #undef HAVE_SSE_REGS
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 897a541ba9..807e985662 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -26,6 +26,13 @@
 
 /* We assume we're being built with and will be used for cygwin.  */
 
+#include <windows.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <imagehlp.h>
+#include <sys/cygwin.h>
 #include "defs.h"
 #include "tm.h"			/* required for SSE registers */
 #include "frame.h"		/* required by inferior.h */
@@ -37,13 +44,6 @@
 #include "regcache.h"
 #include "top.h"
 #include "i386-tdep.h"
-#include <signal.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <imagehlp.h>
-#include <sys/cygwin.h>
 
 #include "buildsym.h"
 #include "symfile.h"
-- 
2.11.0