aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-06-08 10:06:43 -0600
committerTom Tromey <tom@tromey.com>2018-06-08 10:07:37 -0600
commit2f4f025ff15b900706c8597060003a506107cf23 (patch)
tree657adc5f08d4848f5bf9fa7ee808695ebbf88d5c
parent7ebd13590ca56ba32350dbfd1b66c5dc2468268e (diff)
downloadgdb-2f4f025ff15b900706c8597060003a506107cf23.zip
gdb-2f4f025ff15b900706c8597060003a506107cf23.tar.gz
gdb-2f4f025ff15b900706c8597060003a506107cf23.tar.bz2
Fix gdb mingw build
I noticed that the mingw build was failing in the buildbot. This patch fixes the problem. I'm checking it in as obvious. gdb/ChangeLog 2018-06-08 Tom Tromey <tom@tromey.com> * windows-nat.c (windows_nat_target::xfer_partial): "beneath" is now a method.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/windows-nat.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4f732b5..a10155b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2018-06-08 Tom Tromey <tom@tromey.com>
+ * windows-nat.c (windows_nat_target::xfer_partial): "beneath" is
+ now a method.
+
+2018-06-08 Tom Tromey <tom@tromey.com>
+
* btrace.c (parse_xml_raw): Use gdb::unique_xmalloc_ptr.
2018-06-08 Tom Tromey <tom@tromey.com>
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index e3e36cd..63a7800 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2953,8 +2953,8 @@ windows_xfer_shared_libraries (struct target_ops *ops,
enum target_xfer_status
windows_nat_target::xfer_partial (enum target_object object,
const char *annex, gdb_byte *readbuf,
- const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
- ULONGEST *xfered_len)
+ const gdb_byte *writebuf, ULONGEST offset,
+ ULONGEST len, ULONGEST *xfered_len)
{
switch (object)
{
@@ -2966,16 +2966,16 @@ windows_nat_target::xfer_partial (enum target_object object,
writebuf, offset, len, xfered_len);
default:
- if (beneath == NULL)
+ if (beneath () == NULL)
{
/* This can happen when requesting the transfer of unsupported
objects before a program has been started (and therefore
with the current_target having no target beneath). */
return TARGET_XFER_E_IO;
}
- return beneath->xfer_partial (object, annex,
- readbuf, writebuf, offset, len,
- xfered_len);
+ return beneath ()->xfer_partial (object, annex,
+ readbuf, writebuf, offset, len,
+ xfered_len);
}
}