summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorSegev Finer <segev208@gmail.com>2017-01-28 01:01:16 +0200
committerSegev Finer <segev208@gmail.com>2017-01-28 01:01:16 +0200
commit1b4a6c86fa2acc4385c3c420773484d61ecc22b8 (patch)
treedcf7e62e3585b9fdd3a4c51b2f78bdfbc4f09591 /src/libstd
parent450554ebf139d0b6ecde80f17c2ef89ff7de78bb (diff)
downloadrust-1b4a6c86fa2acc4385c3c420773484d61ecc22b8.tar.gz
rust-1b4a6c86fa2acc4385c3c420773484d61ecc22b8.zip
Use libc::c_char instead of i8 due to platforms with unsigned char
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/backtrace/mod.rs3
-rw-r--r--src/libstd/sys/windows/backtrace_gnu.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/backtrace/mod.rs b/src/libstd/sys/unix/backtrace/mod.rs
index 62e9c24ac30..1eef89bf66f 100644
--- a/src/libstd/sys/unix/backtrace/mod.rs
+++ b/src/libstd/sys/unix/backtrace/mod.rs
@@ -94,8 +94,9 @@ mod printing;
 pub mod gnu {
     use io;
     use fs;
+    use libc::c_char;
 
-    pub fn get_executable_filename() -> io::Result<(Vec<i8>, fs::File)> {
+    pub fn get_executable_filename() -> io::Result<(Vec<c_char>, fs::File)> {
         Err(io::Error::new(io::ErrorKind::Other, "Not implemented"))
     }
 }
diff --git a/src/libstd/sys/windows/backtrace_gnu.rs b/src/libstd/sys/windows/backtrace_gnu.rs
index 8282174a59e..f0d29dd4178 100644
--- a/src/libstd/sys/windows/backtrace_gnu.rs
+++ b/src/libstd/sys/windows/backtrace_gnu.rs
@@ -10,6 +10,7 @@
 
 use io;
 use sys::c;
+use libc::c_char;
 use path::PathBuf;
 use fs::{OpenOptions, File};
 use sys::ext::fs::OpenOptionsExt;
@@ -53,7 +54,7 @@ fn lock_and_get_executable_filename() -> io::Result<(PathBuf, File)> {
 // Get the executable filename for libbacktrace
 // This returns the path in the ANSI code page and a File which should remain open
 // for as long as the path should remain valid
-pub fn get_executable_filename() -> io::Result<(Vec<i8>, File)> {
+pub fn get_executable_filename() -> io::Result<(Vec<c_char>, File)> {
     let (executable, file) = lock_and_get_executable_filename()?;
     let u16_executable = to_u16s(executable.into_os_string())?;
     Ok((wide_char_to_multi_byte(c::CP_ACP, c::WC_NO_BEST_FIT_CHARS,