MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-06 20:47:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix whitespaces in arti/redox.patch

Browse Source
This commit is contained in:
Niel Duysters 2026-10-26 02:00:12 +01:00 committed by Niel D
parent c57ae486cf
commit b5b7f271e0
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
recipes/wip/net/onion-routing/arti/redox.patch
View File

@ -2,15 +2,10 @@ diff --git a/crates/fslock-guard/Cargo.toml b/crates/fslock-guard/Cargo.toml
index 9cbffb2c..2fd42d35 100644
--- a/crates/fslock-guard/Cargo.toml
+++ b/crates/fslock-guard/Cargo.toml
@@ -21,7 +21,7 @@ full = []
[dependencies]
thiserror = "2"
@@ -24,2 +24,2 @@
-[target.'cfg(target_os = "android")'.dependencies]
+[target.'cfg(any(target_os = "android", target_os = "redox"))'.dependencies]
libc = "0.2"
[target.'cfg(unix)'.dev-dependencies]
diff --git a/crates/fslock-guard/src/lib.rs b/crates/fslock-guard/src/lib.rs
index b5e938bb..7c32168c 100644
--- a/crates/fslock-guard/src/lib.rs
@ -33,21 +28,11 @@ index b5e938bb..7c32168c 100644
fn do_try_lock(f: &fs::File) -> Result<(), std::fs::TryLockError> {
f.try_lock()
}
@@ -204,7 +204,7 @@ fn do_try_lock(f: &fs::File) -> Result<(), std::fs::TryLockError> {
// TODO MSRV ????: we can remove this once Rust supports file locking on Android
// at our MSRV. As of May 2026, https://github.com/rust-lang/rust/pull/157038/
// seems like the likeliest MR for that, but it has not been merged.
@@ -207,2 +207,2 @@
-#[cfg(target_os = "android")]
+#[cfg(any(target_os = "android", target_os = "redox"))]
fn do_lock(f: &fs::File) -> std::io::Result<()> {
use std::os::fd::AsRawFd;
@@ -231,7 +231,7 @@ fn do_lock(f: &fs::File) -> std::io::Result<()> {
/// on those filesystems.
//
// TODO MSRV ????: See 'TODO MSRV' on do_lock above.
@@ -234,2 +234,2 @@
-#[cfg(target_os = "android")]
+#[cfg(any(target_os = "android", target_os = "redox"))]
fn do_try_lock(f: &fs::File) -> Result<(), std::fs::TryLockError> {
use std::os::fd::AsRawFd;