re PR bootstrap/54611 (Bootstrap failure: conflicting types for 'backtrace_simple')

	PR bootstrap/54611
	* nounwind.c (backtrace_simple): Add state parameter.

From-SVN: r191405

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index e6efd6b..a420500 100644 (file)
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-17  Gerald Pfeifer  <gerald@pfeifer.com>
+
+       PR bootstrap/54611
+       * nounwind.c (backtrace_simple): Add state parameter.
+
 2012-09-17  Ian Lance Taylor  <iant@google.com>
 
        PR bootstrap/54609

diff --git a/libbacktrace/nounwind.c b/libbacktrace/nounwind.c
index fea3c53..71bd5c4 100644 (file)
--- 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)
 {