From 8676616596351876612aa84be798537625348086 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 15 Oct 2017 22:13:22 -0400 Subject: [PATCH] Fix GDB build without expat An earlier patch of mine changed parse_traceframe_info to make it return a unique_ptr. I forgot to update the version of the function used in an expat-less build, this patch fixes it. gdb/ChangeLog: * tracepoint.c (parse_traceframe_info): Return a unique_ptr (the !HAVE_LIBEXPAT version). --- gdb/ChangeLog | 5 +++++ gdb/tracepoint.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 25ae470bb93..4ad642a7816 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-15 Simon Marchi + + * tracepoint.c (parse_traceframe_info): Return a unique_ptr + (the !HAVE_LIBEXPAT version). + 2017-10-14 Simon Marchi * nat/linux-osdata.c (struct pid_pgid_entry) : Make diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 9dd8d8736ee..9c073157b91 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3958,7 +3958,7 @@ sdata_make_value (struct gdbarch *gdbarch, struct internalvar *var, #if !defined(HAVE_LIBEXPAT) -struct traceframe_info * +struct std::unique_ptr parse_traceframe_info (const char *tframe_info) { static int have_warned; -- 2.30.2