Skip to content

Commit

Permalink
Fixed iOS build after *T removal
Browse files Browse the repository at this point in the history
  • Loading branch information
vhbit committed Jul 4, 2014
1 parent 00f9ff2 commit 2bd826c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libstd/rt/backtrace.rs
Expand Up @@ -261,7 +261,7 @@ mod imp {
use slice::{MutableVector};

extern {
fn backtrace(buf: *mut *const libc::c_void,
fn backtrace(buf: *mut *mut libc::c_void,
sz: libc::c_int) -> libc::c_int;
}

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

// skipping the first one as it is write itself
Expand Down

5 comments on commit 2bd826c

@bors
Copy link
Contributor

@bors bors commented on 2bd826c Jul 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at vhbit@2bd826c

@bors
Copy link
Contributor

@bors bors commented on 2bd826c Jul 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vhbit/rust/ios-ptr-fixes = 2bd826c into auto

@bors
Copy link
Contributor

@bors bors commented on 2bd826c Jul 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vhbit/rust/ios-ptr-fixes = 2bd826c merged ok, testing candidate = 25e8b6e

@bors
Copy link
Contributor

@bors bors commented on 2bd826c Jul 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 25e8b6e

Please sign in to comment.