This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] windows-nat: Replace __COPY_CONTEXT_SIZE conditional with __CYGWIN__
- From: Jon TURNEY <jturney at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 15 Jun 2015 11:09:12 -0000
- Subject: [binutils-gdb] windows-nat: Replace __COPY_CONTEXT_SIZE conditional with __CYGWIN__
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f20c58f51f5735d1ba49efadc86b3ec67631410e
commit f20c58f51f5735d1ba49efadc86b3ec67631410e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jun 3 13:58:45 2015 +0100
windows-nat: Replace __COPY_CONTEXT_SIZE conditional with __CYGWIN__
Replace __COPY_CONTEXT_SIZE conditional with __CYGWIN__
__COPY_CONTEXT_SIZE was added to Cygwin's headers in 2006.
Versions of Cygwin which don't define __COPY_CONTEXT_SIZE are long obsolete.
Also see the thread starting at
https://sourceware.org/ml/gdb-patches/2015-03/msg00989.html for some discussion
Note that __COPY_CONTEXT_SIZE should just be sizeof(CONTEXT) (which is a
platform constant), but isn't due to historical mistakes in Cygwin headers.
gdb/ChangeLog:
2015-06-03 Jon Turney <jon.turney@dronecode.org.uk>
* windows-nat.c (do_windows_fetch_inferior_registers)
(handle_output_debug_string): Replace __COPY_CONTEXT_SIZE
conditional with __CYGWIN__.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Diff:
---
gdb/ChangeLog | 6 ++++++
gdb/windows-nat.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 627d65c..4769bad 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-03 Jon Turney <jon.turney@dronecode.org.uk>
+
+ * windows-nat.c (do_windows_fetch_inferior_registers)
+ (handle_output_debug_string): Replace __COPY_CONTEXT_SIZE
+ conditional with __CYGWIN__.
+
2015-06-13 Andrew Burgess <andrew.burgess@embecosm.com>
* completer.c: Add arch-utils.h include.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 8a42511..2f674b6 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -435,7 +435,7 @@ do_windows_fetch_inferior_registers (struct regcache *regcache, int r)
if (current_thread->reload_context)
{
-#ifdef __COPY_CONTEXT_SIZE
+#ifdef __CYGWIN__
if (have_saved_context)
{
/* Lie about where the program actually is stopped since
@@ -829,7 +829,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
warning (("%s"), s);
}
}
-#ifdef __COPY_CONTEXT_SIZE
+#ifdef __CYGWIN__
else
{
/* Got a cygwin signal marker. A cygwin signal is followed by