Skip to content

Commit c3fef8f

Browse files
committed
ohos: Don't emit duplicate lfs64 definitions
The musl module is enabled on ohos, so these are duplicates. (backport <#4804>) (cherry picked from commit b30e714)
1 parent ffedb8c commit c3fef8f

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,
@@ -6752,7 +6752,7 @@ extern "C" {
67526752
//
67536753
// * musl has 64-bit versions only so aliases the LFS64 symbols to the standard ones
67546754
cfg_if! {
6755-
if #[cfg(not(target_env = "musl"))] {
6755+
if #[cfg(not(any(target_env = "musl", target_env = "ohos")))] {
67566756
extern "C" {
67576757
pub fn fallocate64(fd: c_int, mode: c_int, offset: off64_t, len: off64_t) -> c_int;
67586758
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
@@ -2071,7 +2071,11 @@ extern "C" {
20712071
// * musl and Emscripten has 64-bit versions only so aliases the LFS64 symbols to the standard ones
20722072
// * ulibc doesn't have preadv64/pwritev64
20732073
cfg_if! {
2074-
if #[cfg(not(any(target_env = "musl", target_os = "emscripten")))] {
2074+
if #[cfg(not(any(
2075+
target_env = "musl",
2076+
target_env = "ohos",
2077+
target_os = "emscripten",
2078+
)))] {
20752079
extern "C" {
20762080
pub fn fstatfs64(fd: c_int, buf: *mut statfs64) -> c_int;
20772081
pub fn statvfs64(path: *const c_char, buf: *mut statvfs64) -> c_int;
@@ -2131,7 +2135,8 @@ cfg_if! {
21312135
if #[cfg(not(any(
21322136
target_env = "uclibc",
21332137
target_env = "musl",
2134-
target_os = "emscripten"
2138+
target_env = "ohos",
2139+
target_os = "emscripten",
21352140
)))] {
21362141
extern "C" {
21372142
pub fn preadv64(

0 commit comments

Comments
 (0)