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

+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

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