* [FYI] Fix gdb mingw build
@ 2018-06-08 16:08 Tom Tromey
2018-06-08 17:07 ` Joel Brobecker
0 siblings, 1 reply; 2+ messages in thread
From: Tom Tromey @ 2018-06-08 16:08 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
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.
---
gdb/ChangeLog | 5 +++++
gdb/windows-nat.c | 12 ++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4f732b5b81..a10155bd95 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index e3e36cdc3e..63a780014a 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);
}
}
--
2.14.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [FYI] Fix gdb mingw build
2018-06-08 16:08 [FYI] Fix gdb mingw build Tom Tromey
@ 2018-06-08 17:07 ` Joel Brobecker
0 siblings, 0 replies; 2+ messages in thread
From: Joel Brobecker @ 2018-06-08 17:07 UTC (permalink / raw)
To: Tom Tromey; +Cc: gdb-patches
> 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.
Gasp. I think this was because of me; mea culpa, and thanks a lot
for fixing, Tom.
--
Joel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-08 17:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-08 16:08 [FYI] Fix gdb mingw build Tom Tromey
2018-06-08 17:07 ` Joel Brobecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).