auto merge of #15404 : vhbit/rust/ios-ptr-fixes, r=pcwalton

rust-lang · Jul 4, 2014 · 25e8b6e · 25e8b6e
2 parents c9e2ca0 + 2bd826c
commit 25e8b6e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
@@ -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;
         }
 
@@ -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