vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_compilation' into 'main'

Browse Source 
Fix compilation

See merge request redox-os/base!248
This commit is contained in:
Jeremy Soller
2026-04-27 14:19:03 -06:00
parent 6821e38eba 009ffe1dbc
commit 4b8158b111
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/graphics/virtio-gpud/src/main.rs
+2 -2
View File
@@ -481,8 +481,8 @@ fn main() {
pcid_interface::pci_daemon(daemon_runner);
}
fn daemon_runner(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
daemon(daemon, pcid_handle).unwrap();
fn daemon_runner(redox_daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
daemon(redox_daemon, pcid_handle).unwrap();
unreachable!();
}
drivers/inputd/src/main.rs
+2 -2
View File
@@ -588,8 +588,8 @@ fn daemon(daemon: daemon::SchemeDaemon) -> anyhow::Result<()> {
}
}
fn daemon_runner(daemon: daemon::SchemeDaemon) -> ! {
daemon(daemon).unwrap();
fn daemon_runner(redox_daemon: daemon::SchemeDaemon) -> ! {
daemon(redox_daemon).unwrap();
unreachable!();
}
drivers/net/virtio-netd/src/main.rs
+2 -2
View File
@@ -30,8 +30,8 @@ fn main() {
pcid_interface::pci_daemon(daemon_runner);
}
fn daemon_runner(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
daemon(daemon, pcid_handle).unwrap();
fn daemon_runner(redox_daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
daemon(redox_daemon, pcid_handle).unwrap();
unreachable!();
}