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

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
c5812e0b · Ian Lance Taylor · Ian Lance Taylor · e8f4008a · c5812e0b · c5812e0b
Commit c5812e0b authored Sep 17, 2012 by Ian Lance Taylor Committed by Ian Lance Taylor Sep 17, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

libbacktrace/ChangeLog
+6 -0

libbacktrace/nounwind.c
+4 -3

No files found.
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
+2012-09-17  Ian Lance Taylor  <iant@google.com>
+
+	PR bootstrap/54611
+	* nounwind.c (backtrace_full): Rename from backtrace.  Add state
+	parameter.
+
 2012-09-17  Gerald Pfeifer  <gerald@pfeifer.com>

 	PR bootstrap/54611

--- 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",