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

2
.gitmodules vendored
View file

@ -10,7 +10,7 @@
url = https://github.com/rust-lang/rust-installer.git url = https://github.com/rust-lang/rust-installer.git
[submodule "src/liblibc"] [submodule "src/liblibc"]
path = src/liblibc path = src/liblibc
url = https://gitlab.redox-os.org/redox-os/liblibc.git url = https://github.com/rust-lang/libc.git
[submodule "src/doc/nomicon"] [submodule "src/doc/nomicon"]
path = src/doc/nomicon path = src/doc/nomicon
url = https://github.com/rust-lang-nursery/nomicon.git url = https://github.com/rust-lang-nursery/nomicon.git

2
src/liblibc

@ -1 +1 @@
Subproject commit 1844a772b60771d0124a157019f627d60fea4e73 Subproject commit c75ca6465a139704e00295be355b1f067af2f535

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

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