Skip to content

Commit b30e714

Browse files
committed
ohos: Don't emit duplicate lfs64 definitions
The musl module is enabled on ohos, so these are duplicates.
1 parent 4bc2673 commit b30e714

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/unix/linux_like/linux/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ s! {
11871187
size: [u8; crate::__SIZEOF_PTHREAD_BARRIERATTR_T],
11881188
}
11891189

1190-
#[cfg(not(target_env = "musl"))]
1190+
#[cfg(not(any(target_env = "musl", target_env = "ohos")))]
11911191
#[repr(align(8))]
11921192
pub struct fanotify_event_metadata {
11931193
pub event_len: __u32,
@@ -6723,7 +6723,7 @@ extern "C" {
67236723
//
67246724
// * musl has 64-bit versions only so aliases the LFS64 symbols to the standard ones
67256725
cfg_if! {
6726-
if #[cfg(not(target_env = "musl"))] {
6726+
if #[cfg(not(any(target_env = "musl", target_env = "ohos")))] {
67276727
extern "C" {
67286728
pub fn fallocate64(fd: c_int, mode: c_int, offset: off64_t, len: off64_t) -> c_int;
67296729
pub fn fgetpos64(stream: *mut crate::FILE, ptr: *mut fpos64_t) -> c_int;

src/unix/linux_like/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,7 +2100,11 @@ extern "C" {
21002100
// * musl and Emscripten has 64-bit versions only so aliases the LFS64 symbols to the standard ones
21012101
// * ulibc doesn't have preadv64/pwritev64
21022102
cfg_if! {
2103-
if #[cfg(not(any(target_env = "musl", target_os = "emscripten")))] {
2103+
if #[cfg(not(any(
2104+
target_env = "musl",
2105+
target_env = "ohos",
2106+
target_os = "emscripten",
2107+
)))] {
21042108
extern "C" {
21052109
pub fn fstatfs64(fd: c_int, buf: *mut statfs64) -> c_int;
21062110
pub fn statvfs64(path: *const c_char, buf: *mut statvfs64) -> c_int;
@@ -2160,7 +2164,8 @@ cfg_if! {
21602164
if #[cfg(not(any(
21612165
target_env = "uclibc",
21622166
target_env = "musl",
2163-
target_os = "emscripten"
2167+
target_env = "ohos",
2168+
target_os = "emscripten",
21642169
)))] {
21652170
extern "C" {
21662171
pub fn preadv64(

0 commit comments

Comments
 (0)