From e8f4008a9e158acbe96026e1ea9f2da7f3c8a354 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Mon, 17 Sep 2012 20:57:16 +0000 Subject: [PATCH] re PR bootstrap/54611 (Bootstrap failure: conflicting types for 'backtrace_simple') PR bootstrap/54611 * nounwind.c (backtrace_simple): Add state parameter. From-SVN: r191405 --- libbacktrace/ChangeLog | 5 +++++ libbacktrace/nounwind.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index e6efd6b4c80..a420500e64f 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,8 @@ +2012-09-17 Gerald Pfeifer + + PR bootstrap/54611 + * nounwind.c (backtrace_simple): Add state parameter. + 2012-09-17 Ian Lance Taylor PR bootstrap/54609 diff --git a/libbacktrace/nounwind.c b/libbacktrace/nounwind.c index fea3c53d271..71bd5c49acf 100644 --- a/libbacktrace/nounwind.c +++ b/libbacktrace/nounwind.c @@ -53,7 +53,8 @@ backtrace (int skip ATTRIBUTE_UNUSED, } int -backtrace_simple (int skip ATTRIBUTE_UNUSED, +backtrace_simple (struct backtrace_state *state ATTRIBUTE_UNUSED, + int skip ATTRIBUTE_UNUSED, backtrace_simple_callback callback ATTRIBUTE_UNUSED, backtrace_error_callback error_callback, void *data) { -- 2.30.2