From: Gerald Pfeifer <gerald@pfeifer.com>
Date: Mon, 17 Sep 2012 20:57:16 +0000 (+0000)
Subject: re PR bootstrap/54611 (Bootstrap failure:  conflicting types for 'backtrace_simple')
X-Git-Tag: misc/gccgo-go1_1_2~802
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8f4008a9e158acbe96026e1ea9f2da7f3c8a354;p=thirdparty%2Fgcc.git

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 e6efd6b4c808..a420500e64ff 100644
--- 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 fea3c53d2712..71bd5c49acf1 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)
 {