bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert liblibc submodule url

Browse source
This commit is contained in:
jD91mZM2 2018-10-18 16:53:26 +02:00
parent 9d42b1bf04
commit 91c1b7a929
No known key found for this signature in database
GPG key ID: 3055D54729A72666
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libstd/sys/redox/process.rs
View file

@ -10,16 +10,11 @@
use env::{split_paths};
use ffi::{CStr, OsStr};
use fs::File;
use os::unix::ffi::OsStrExt;
use fmt;
<<<<<<< HEAD
use io::{self, Error, ErrorKind};
use iter;
=======
use fs::File;
use io::{self, prelude::*, BufReader, Error, ErrorKind, SeekFrom};
>>>>>>> b7b1d416a1... Interpret shebangs on redox
use libc::{EXIT_SUCCESS, EXIT_FAILURE};
use os::unix::ffi::OsStrExt;
use path::{Path, PathBuf};
use ptr;
use sys::ext::fs::MetadataExt;