about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-04 17:16:29 +0000
committerbors <bors@rust-lang.org>2014-07-04 17:16:29 +0000
commit25e8b6ed9c9cf60448eb95a0e8a42330ed44f479 (patch)
treea1ca65c6bbc85aae64375dd224fddd62abf7ef33 /src/libstd/rt
parentc9e2ca0dfad8f2aff48c64887b1ec4276929eced (diff)
parent2bd826cac267442a3d1d817c8f5adba564e4e83f (diff)
downloadrust-25e8b6ed9c9cf60448eb95a0e8a42330ed44f479.tar.gz
rust-25e8b6ed9c9cf60448eb95a0e8a42330ed44f479.zip
auto merge of #15404 : vhbit/rust/ios-ptr-fixes, r=pcwalton
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/backtrace.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index 2e0dcdd8eb6..404887823cb 100644
--- 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