Skip to content

Commit 01d1fcf

Browse files
committed
Auto merge of #2772 - devnexen:haiku_build_fix2, r=Amanieu
haiku build fix
2 parents dcd0a69 + 9bf2fb0 commit 01d1fcf

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/unix/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,6 @@ extern "C" {
516516
pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
517517
pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
518518
pub fn stpcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
519-
pub fn stpncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
520519
pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
521520
pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
522521
pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
@@ -1396,9 +1395,11 @@ extern "C" {
13961395
}
13971396
cfg_if! {
13981397
if #[cfg(not(any(target_os = "emscripten",
1399-
target_os = "android")))] {
1398+
target_os = "android",
1399+
target_os = "haiku")))] {
14001400
extern "C" {
14011401
pub fn adjtime(delta: *const timeval, olddelta: *mut timeval) -> ::c_int;
1402+
pub fn stpncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
14021403
}
14031404
}
14041405
}

0 commit comments

Comments
 (0)