From c5812e0b33af62b9b1f7646453282545e212b065 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 17 Sep 2012 21:14:51 +0000 Subject: [PATCH] re PR bootstrap/54611 (Bootstrap failure: conflicting types for 'backtrace_simple') PR bootstrap/54611 * nounwind.c (backtrace_full): Rename from backtrace. Add state parameter. From-SVN: r191408 --- libbacktrace/ChangeLog | 6 ++++++ libbacktrace/nounwind.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index a420500e64f..ec3e1b75e8b 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,9 @@ +2012-09-17 Ian Lance Taylor + + PR bootstrap/54611 + * nounwind.c (backtrace_full): Rename from backtrace. Add state + parameter. + 2012-09-17 Gerald Pfeifer PR bootstrap/54611 diff --git a/libbacktrace/nounwind.c b/libbacktrace/nounwind.c index 71bd5c49acf..bf7635ce0e7 100644 --- a/libbacktrace/nounwind.c +++ b/libbacktrace/nounwind.c @@ -42,9 +42,10 @@ POSSIBILITY OF SUCH DAMAGE. */ available. */ int -backtrace (int skip ATTRIBUTE_UNUSED, - backtrace_full_callback callback ATTRIBUTE_UNUSED, - backtrace_error_callback error_callback, void *data) +backtrace_full (struct backtrace_state *state ATTRIBUTE_UNUSED, + int skip ATTRIBUTE_UNUSED, + backtrace_full_callback callback ATTRIBUTE_UNUSED, + backtrace_error_callback error_callback, void *data) { error_callback (data, "no stack trace because unwind library not available",