Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Haiku: synchronize with post R1-beta 4 changes in libc #3638

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Haiku: synchronize with post R1-beta 4 changes in libc #3638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 81 additions & 5 deletions src/unix/haiku/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ pub const F_RDLCK: ::c_int = 0x0040;
pub const F_UNLCK: ::c_int = 0x0200;
pub const F_WRLCK: ::c_int = 0x0400;

pub const AT_FDCWD: ::c_int = -1;
pub const AT_FDCWD: ::c_int = -100;
pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x01;
pub const AT_SYMLINK_FOLLOW: ::c_int = 0x02;
pub const AT_REMOVEDIR: ::c_int = 0x04;
Expand Down Expand Up @@ -1192,6 +1192,80 @@ pub const _SC_REGEXP: ::c_int = 62;
pub const _SC_SYMLOOP_MAX: ::c_int = 63;
pub const _SC_SHELL: ::c_int = 64;
pub const _SC_TTY_NAME_MAX: ::c_int = 65;
pub const _SC_ADVISORY_INFO: ::c_int = 66;
pub const _SC_BARRIERS: ::c_int = 67;
pub const _SC_CLOCK_SELECTION: ::c_int = 68;
pub const _SC_FSYNC: ::c_int = 69;
pub const _SC_IPV6: ::c_int = 70;
pub const _SC_MEMLOCK: ::c_int = 71;
pub const _SC_MEMLOCK_RANGE: ::c_int = 72;
pub const _SC_MESSAGE_PASSING: ::c_int = 73;
pub const _SC_PRIORITIZED_IO: ::c_int = 74;
pub const _SC_PRIORITY_SCHEDULING: ::c_int = 75;
pub const _SC_READER_WRITER_LOCKS: ::c_int = 76;
pub const _SC_SHARED_MEMORY_OBJECTS: ::c_int = 77;
pub const _SC_SPAWN: ::c_int = 78;
pub const _SC_SPIN_LOCKS: ::c_int = 79;
pub const _SC_SPORADIC_SERVER: ::c_int = 80;
pub const _SC_SYNCHRONIZED_IO: ::c_int = 81;
pub const _SC_THREAD_PRIO_INHERIT: ::c_int = 82;
pub const _SC_THREAD_PRIO_PROTECT: ::c_int = 83;
pub const _SC_THREAD_ROBUST_PRIO_INHERIT: ::c_int = 84;
pub const _SC_THREAD_ROBUST_PRIO_PROTECT: ::c_int = 85;
pub const _SC_THREAD_SAFE_FUNCTIONS: ::c_int = 86;
pub const _SC_THREAD_SPORADIC_SERVER: ::c_int = 87;
pub const _SC_TIMEOUTS: ::c_int = 88;
pub const _SC_TRACE: ::c_int = 89;
pub const _SC_TRACE_EVENT_FILTER: ::c_int = 90;
pub const _SC_TRACE_INHERIT: ::c_int = 91;
pub const _SC_TRACE_LOG: ::c_int = 92;
pub const _SC_TYPED_MEMORY_OBJECTS: ::c_int = 93;
pub const _SC_V6_ILP32_OFF32: ::c_int = 94;
pub const _SC_V6_ILP32_OFFBIG: ::c_int = 95;
pub const _SC_V6_LP64_OFF64: ::c_int = 96;
pub const _SC_V6_LPBIG_OFFBIG: ::c_int = 97;
pub const _SC_V7_ILP32_OFF32: ::c_int = 98;
pub const _SC_V7_ILP32_OFFBIG: ::c_int = 99;
pub const _SC_V7_LP64_OFF64: ::c_int = 100;
pub const _SC_V7_LPBIG_OFFBIG: ::c_int = 101;
pub const _SC_2_C_BIND: ::c_int = 102;
pub const _SC_2_C_DEV: ::c_int = 103;
pub const _SC_2_CHAR_TERM: ::c_int = 104;
pub const _SC_2_FORT_DEV: ::c_int = 105;
pub const _SC_2_FORT_RUN: ::c_int = 106;
pub const _SC_2_LOCALEDEF: ::c_int = 107;
pub const _SC_2_PBS: ::c_int = 108;
pub const _SC_2_PBS_ACCOUNTING: ::c_int = 109;
pub const _SC_2_PBS_CHECKPOINT: ::c_int = 110;
pub const _SC_2_PBS_LOCATE: ::c_int = 111;
pub const _SC_2_PBS_MESSAGE: ::c_int = 112;
pub const _SC_2_PBS_TRACK: ::c_int = 113;
pub const _SC_2_SW_DEV: ::c_int = 114;
pub const _SC_2_UPE: ::c_int = 115;
pub const _SC_2_VERSION: ::c_int = 116;
pub const _SC_XOPEN_CRYPT: ::c_int = 117;
pub const _SC_XOPEN_ENH_I18N: ::c_int = 118;
pub const _SC_XOPEN_REALTIME: ::c_int = 119;
pub const _SC_XOPEN_REALTIME_THREADS: ::c_int = 120;
pub const _SC_XOPEN_SHM: ::c_int = 121;
pub const _SC_XOPEN_STREAMS: ::c_int = 122;
pub const _SC_XOPEN_UNIX: ::c_int = 123;
pub const _SC_XOPEN_UUCP: ::c_int = 124;
pub const _SC_XOPEN_VERSION: ::c_int = 125;
pub const _SC_BC_BASE_MAX: ::c_int = 129;
pub const _SC_BC_DIM_MAX: ::c_int = 130;
pub const _SC_BC_SCALE_MAX: ::c_int = 131;
pub const _SC_BC_STRING_MAX: ::c_int = 132;
pub const _SC_COLL_WEIGHTS_MAX: ::c_int = 133;
pub const _SC_EXPR_NEST_MAX: ::c_int = 134;
pub const _SC_LINE_MAX: ::c_int = 135;
pub const _SC_LOGIN_NAME_MAX: ::c_int = 136;
pub const _SC_MQ_OPEN_MAX: ::c_int = 137;
pub const _SC_MQ_PRIO_MAX: ::c_int = 138;
pub const _SC_THREAD_DESTRUCTOR_ITERATIONS: ::c_int = 139;
pub const _SC_THREAD_KEYS_MAX: ::c_int = 140;
pub const _SC_THREAD_THREADS_MAX: ::c_int = 141;
pub const _SC_RE_DUP_MAX: ::c_int = 142;

pub const PTHREAD_STACK_MIN: ::size_t = 8192;

Expand Down Expand Up @@ -1386,8 +1460,9 @@ pub const TCGB_RI: ::c_int = 0x04;
pub const TCGB_DCD: ::c_int = 0x08;
pub const TIOCM_CTS: ::c_int = TCGB_CTS;
pub const TIOCM_CD: ::c_int = TCGB_DCD;
pub const TIOCM_CAR: ::c_int = TIOCM_CD;
pub const TIOCM_CAR: ::c_int = TCGB_DCD;
pub const TIOCM_RI: ::c_int = TCGB_RI;
pub const TIOCM_RNG: ::c_int = TCGB_RI;
pub const TIOCM_DSR: ::c_int = TCGB_DSR;
pub const TIOCM_DTR: ::c_int = 0x10;
pub const TIOCM_RTS: ::c_int = 0x20;
Expand Down Expand Up @@ -1430,17 +1505,14 @@ pub const TCGETA: ::c_ulong = 0x8000;
pub const TCSETA: ::c_ulong = TCGETA + 1;
pub const TCSETAF: ::c_ulong = TCGETA + 2;
pub const TCSETAW: ::c_ulong = TCGETA + 3;
pub const TCWAITEVENT: ::c_ulong = TCGETA + 4;
pub const TCSBRK: ::c_ulong = TCGETA + 5;
pub const TCFLSH: ::c_ulong = TCGETA + 6;
pub const TCXONC: ::c_ulong = TCGETA + 7;
pub const TCQUERYCONNECTED: ::c_ulong = TCGETA + 8;
pub const TCGETBITS: ::c_ulong = TCGETA + 9;
pub const TCSETDTR: ::c_ulong = TCGETA + 10;
pub const TCSETRTS: ::c_ulong = TCGETA + 11;
pub const TIOCGWINSZ: ::c_ulong = TCGETA + 12;
pub const TIOCSWINSZ: ::c_ulong = TCGETA + 13;
pub const TCVTIME: ::c_ulong = TCGETA + 14;
pub const TIOCGPGRP: ::c_ulong = TCGETA + 15;
pub const TIOCSPGRP: ::c_ulong = TCGETA + 16;
pub const TIOCSCTTY: ::c_ulong = TCGETA + 17;
Expand All @@ -1450,6 +1522,10 @@ pub const TIOCSBRK: ::c_ulong = TCGETA + 20;
pub const TIOCCBRK: ::c_ulong = TCGETA + 21;
pub const TIOCMBIS: ::c_ulong = TCGETA + 22;
pub const TIOCMBIC: ::c_ulong = TCGETA + 23;
pub const TIOCGSID: ::c_ulong = TCGETA + 24;
pub const TIOCOUTQ: ::c_ulong = TCGETA + 25;
pub const TIOCEXCL: ::c_ulong = TCGETA + 26;
pub const TIOCNXCL: ::c_ulong = TCGETA + 27;

pub const PRIO_PROCESS: ::c_int = 0;
pub const PRIO_PGRP: ::c_int = 1;
Expand Down
9 changes: 9 additions & 0 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,15 @@ cfg_if! {
target_os = "nto")))] {
extern "C" {
pub fn adjtime(delta: *const timeval, olddelta: *mut timeval) -> ::c_int;
}
}
}

cfg_if! {
if #[cfg(not(any(target_os = "emscripten",
target_os = "android",
target_os = "nto")))] {
extern "C" {
pub fn stpncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
}