Skip to content

Commit 25e8b6e

Browse files
committed
auto merge of #15404 : vhbit/rust/ios-ptr-fixes, r=pcwalton
2 parents c9e2ca0 + 2bd826c commit 25e8b6e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/libstd/rt/backtrace.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ mod imp {
261261
use slice::{MutableVector};
262262

263263
extern {
264-
fn backtrace(buf: *mut *const libc::c_void,
264+
fn backtrace(buf: *mut *mut libc::c_void,
265265
sz: libc::c_int) -> libc::c_int;
266266
}
267267

@@ -274,7 +274,7 @@ mod imp {
274274
try!(writeln!(w, "stack backtrace:"));
275275
// 100 lines should be enough
276276
static SIZE: libc::c_int = 100;
277-
let mut buf: [*const libc::c_void, ..SIZE] = unsafe {mem::zeroed()};
277+
let mut buf: [*mut libc::c_void, ..SIZE] = unsafe {mem::zeroed()};
278278
let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE) as uint};
279279

280280
// skipping the first one as it is write itself

0 commit comments

Comments
 (0)