diff options
| author | Gerald Pfeifer <gerald@pfeifer.com> | 2012-09-17 20:57:16 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2012-09-17 20:57:16 +0000 |
| commit | e8f4008a9e158acbe96026e1ea9f2da7f3c8a354 (patch) | |
| tree | 7bdead42854bc09d73b70d0b5518f48ca4629239 /libbacktrace | |
| parent | 2611b5ba2e1e9bffe94f47f31b299bc84a0c5136 (diff) | |
| download | gcc-e8f4008a9e158acbe96026e1ea9f2da7f3c8a354.tar.gz | |
re PR bootstrap/54611 (Bootstrap failure: conflicting types for 'backtrace_simple')
PR bootstrap/54611
* nounwind.c (backtrace_simple): Add state parameter.
From-SVN: r191405
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/ChangeLog | 5 | ||||
| -rw-r--r-- | libbacktrace/nounwind.c | 3 |
2 files changed, 7 insertions, 1 deletions
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 <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 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) { |