about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorMichael Hewson <michael@michaelhewson.ca>2017-12-22 12:40:39 -0500
committerMichael Hewson <michael@michaelhewson.ca>2017-12-22 12:40:39 -0500
commite94b29065fab8da9530029f810306da1797810a1 (patch)
treeab6c79eb8bb93984679dd1d5d0dff8d10c35c65c /src/libstd
parent0783db9e0f5acec306055c2243b42c761201903a (diff)
downloadrust-e94b29065fab8da9530029f810306da1797810a1.tar.gz
rust-e94b29065fab8da9530029f810306da1797810a1.zip
fix some errors in libstd
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/os.rs2
-rw-r--r--src/libstd/sys_common/gnu/libbacktrace.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs
index 4f33a2b12fe..a46e855b4a6 100644
--- a/src/libstd/sys/unix/os.rs
+++ b/src/libstd/sys/unix/os.rs
@@ -453,7 +453,7 @@ pub fn getenv(k: &OsStr) -> io::Result<Option<OsString>> {
     let k = CString::new(k.as_bytes())?;
     unsafe {
         ENV_LOCK.lock();
-        let s = libc::getenv(k.as_ptr()) as *const _;
+        let s = libc::getenv(k.as_ptr()) as *const libc::c_char;
         let ret = if s.is_null() {
             None
         } else {
diff --git a/src/libstd/sys_common/gnu/libbacktrace.rs b/src/libstd/sys_common/gnu/libbacktrace.rs
index 75c6bd5d2a2..6ad3af6aee1 100644
--- a/src/libstd/sys_common/gnu/libbacktrace.rs
+++ b/src/libstd/sys_common/gnu/libbacktrace.rs
@@ -73,7 +73,7 @@ pub fn resolve_symname<F>(frame: Frame,
                 "failed to allocate libbacktrace state")
             )
         }
-        let mut data = ptr::null();
+        let mut data: *const libc::c_char = ptr::null();
         let data_addr = &mut data as *mut *const libc::c_char;
         let ret = unsafe {
             backtrace_syminfo(state,