Merge branch 'update-syscall-version-plus-buildix' into 'master'

Syscall dependency version bump + Fix build breakage

See merge request redox-os/init!6
This commit is contained in:
Jeremy Soller
2021-01-15 19:45:05 +00:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -3,4 +3,4 @@ name = "init"
version = "0.1.0"
[dependencies]
redox_syscall = "0.1"
redox_syscall = "0.2"
+2 -2
View File
@@ -8,7 +8,7 @@ use std::io::{Read, Error, Result};
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
use std::path::Path;
use std::process::Command;
use syscall::flag::{O_RDONLY, O_WRONLY};
use syscall::flag::{WaitFlags, O_RDONLY, O_WRONLY};
fn switch_stdio(stdio: &str) -> Result<()> {
let stdin = unsafe { File::from_raw_fd(
@@ -145,6 +145,6 @@ pub fn main() {
loop {
let mut status = 0;
syscall::waitpid(0, &mut status, 0).unwrap();
syscall::waitpid(0, &mut status, WaitFlags::empty()).unwrap();
}
}