From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [FYI] Fix gdb mingw build
Date: Fri, 08 Jun 2018 16:08:00 -0000 [thread overview]
Message-ID: <20180608160803.16455-1-tom@tromey.com> (raw)
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
next reply other threads:[~2018-06-08 16:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 16:08 Tom Tromey [this message]
2018-06-08 17:07 ` Joel Brobecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180608160803.16455-1-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).