diff --git a/src/platform/redox/clone.rs b/src/platform/redox/clone.rs deleted file mode 100644 index cf4e52da82..0000000000 --- a/src/platform/redox/clone.rs +++ /dev/null @@ -1 +0,0 @@ -pub use redox_rt::{proc::*, thread::*}; diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs index f9c963dd47..db3c8368b7 100644 --- a/src/platform/redox/mod.rs +++ b/src/platform/redox/mod.rs @@ -6,6 +6,7 @@ use core::{ }; use redox_rt::{ RtTcb, + proc::*, protocol::{WaitFlags, wifstopped}, sys::{Resugid, WaitpidTarget}, }; @@ -56,7 +57,6 @@ use crate::{ pub use redox_rt::proc::FdGuard; -mod clone; mod epoll; mod event; mod exec; @@ -312,7 +312,7 @@ impl Pal for Sys { // TODO: Find way to avoid lock. let _guard = CLONE_LOCK.write(); - Ok(clone::fork_impl(&redox_rt::proc::ForkArgs::Managed)? as pid_t) + Ok(fork_impl(&redox_rt::proc::ForkArgs::Managed)? as pid_t) } fn fstat(fildes: c_int, mut buf: Out) -> Result<()> { @@ -956,7 +956,7 @@ impl Pal for Sys { os_specific: &mut OsSpecific, ) -> Result { let _guard = CLONE_LOCK.read(); - let res = unsafe { clone::rlct_clone_impl(stack, os_specific) }; + let res = unsafe { redox_rt::thread::rlct_clone_impl(stack, os_specific) }; res.map(|thread_fd| crate::pthread::OsTid { thread_fd }) .map_err(|error| Errno(error.errno))