vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update nix to 0.19 (#237)

This commit is contained in:
Eric Anholt 2020-10-31 10:33:18 -07:00 committed by GitHub
parent d3429fa37d
commit 78d28165c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -22,7 +22,7 @@ input = { version = "0.5", default-features = false, optional = true }
lazy_static = "1" lazy_static = "1"
libc = "0.2.70" libc = "0.2.70"
libloading = "0.6.0" libloading = "0.6.0"
nix = "0.18" nix = "0.19"
slog = "2" slog = "2"
slog-stdlog = { version = "4", optional = true } slog-stdlog = { version = "4", optional = true }
tempfile = { version = "3.0", optional = true } tempfile = { version = "3.0", optional = true }

2
anvil/src/winit.rs
View File

@ -147,7 +147,7 @@ pub fn run_winit(
error!(log, "Error during rendering: {:?}", err); error!(log, "Error during rendering: {:?}", err);
} }
} }
if event_loop if event_loop
.dispatch(Some(Duration::from_millis(16)), &mut state) .dispatch(Some(Duration::from_millis(16)), &mut state)
.is_err() .is_err()

4
src/xwayland/xserver.rs
View File

@ -182,7 +182,7 @@ fn launch<WM: XWindowManager + 'static, T: Any>(
let sigusr1_handler = (&mut *guard.source_maker)(inner.clone())?; let sigusr1_handler = (&mut *guard.source_maker)(inner.clone())?;
// all is ready, we can do the fork dance // all is ready, we can do the fork dance
let child_pid = match fork() { let child_pid = match unsafe { fork() } {
Ok(ForkResult::Parent { child }) => { Ok(ForkResult::Parent { child }) => {
// we are the main smithay process // we are the main smithay process
child child
@ -195,7 +195,7 @@ fn launch<WM: XWindowManager + 'static, T: Any>(
set.add(signal::Signal::SIGCHLD); set.add(signal::Signal::SIGCHLD);
// we can't handle errors here anyway // we can't handle errors here anyway
let _ = signal::sigprocmask(signal::SigmaskHow::SIG_BLOCK, Some(&set), None); let _ = signal::sigprocmask(signal::SigmaskHow::SIG_BLOCK, Some(&set), None);
match fork() { match unsafe { fork() } {
Ok(ForkResult::Parent { child }) => { Ok(ForkResult::Parent { child }) => {
// we are still the first child // we are still the first child
let sig = set.wait(); let sig = set.wait();