diff options
| -rwxr-xr-x | libc-test/build.rs | 2 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/uclibc/mod.rs | 4 | ||||
| -rw-r--r-- | src/unix/mod.rs | 18 |
3 files changed, 15 insertions, 9 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index aec143fe8f..0eb23ef3d4 100755 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -2663,7 +2663,7 @@ fn test_linux(target: &str) { // support, we except them from the tests here. // See https://github.com/rust-lang/libc/pull/2019#issuecomment-754351482 "EPOLLEXCLUSIVE" | "EPOLLWAKEUP" if uclibc => true, - + // FIXME: Requires recent kernel headers (5.8): "STATX_MNT_ID" => true, diff --git a/src/unix/linux_like/linux/uclibc/mod.rs b/src/unix/linux_like/linux/uclibc/mod.rs index a86d18ccdd..cc5d5cdce9 100644 --- a/src/unix/linux_like/linux/uclibc/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mod.rs @@ -147,8 +147,8 @@ pub const LC_ALL: ::c_int = 6; // end different section // MS_ flags for mount(2) -pub const MS_RMT_MASK: ::c_ulong = ::MS_RDONLY|::MS_SYNCHRONOUS| - ::MS_MANDLOCK|::MS_I_VERSION; +pub const MS_RMT_MASK: ::c_ulong = + ::MS_RDONLY | ::MS_SYNCHRONOUS | ::MS_MANDLOCK | ::MS_I_VERSION; pub const ENOTSUP: ::c_int = EOPNOTSUPP; diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 6aa6c5b53e..b3c0b47141 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -623,18 +623,24 @@ extern "C" { ... ) -> ::c_int; pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int; - #[cfg_attr(all(target_os = "linux", not(target_env = "uclibc")), - link_name = "__isoc99_fscanf")] + #[cfg_attr( + all(target_os = "linux", not(target_env = "uclibc")), + link_name = "__isoc99_fscanf" + )] pub fn fscanf( stream: *mut ::FILE, format: *const ::c_char, ... ) -> ::c_int; - #[cfg_attr(all(target_os = "linux", not(target_env = "uclibc")), - link_name = "__isoc99_scanf")] + #[cfg_attr( + all(target_os = "linux", not(target_env = "uclibc")), + link_name = "__isoc99_scanf" + )] pub fn scanf(format: *const ::c_char, ...) -> ::c_int; - #[cfg_attr(all(target_os = "linux", not(target_env = "uclibc")), - link_name = "__isoc99_sscanf")] + #[cfg_attr( + all(target_os = "linux", not(target_env = "uclibc")), + link_name = "__isoc99_sscanf" + )] pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int; pub fn getchar_unlocked() -> ::c_int; |