Adjustments for latest merge
This commit is contained in:
commit
cbc88ca0d5
|
@ -932,7 +932,10 @@ pub const _SC_TRACE_SYS_MAX: ::c_int = 129;
|
|||
pub const _SC_TRACE_USER_EVENT_MAX: ::c_int = 130;
|
||||
pub const _SC_PASS_MAX: ::c_int = 131;
|
||||
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
|
||||
pub const _PTHREAD_MUTEX_SIG_init: ::c_long = 0x32AAABA7;
|
||||
pub const _PTHREAD_COND_SIG_init: ::c_long = 0x3CB0B1BB;
|
||||
pub const _PTHREAD_RWLOCK_SIG_init: ::c_long = 0x2DA8B3B4;
|
||||
|
|
|
@ -647,7 +647,11 @@ pub const _SC_HOST_NAME_MAX: ::c_int = 72;
|
|||
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
|
||||
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
|
||||
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = 0 as *mut _;
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
|
||||
pub const PTHREAD_MUTEX_ADAPTIVE_NP: ::c_int = 4;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_ERRORCHECK;
|
||||
|
||||
pub const SCHED_FIFO: ::c_int = 1;
|
||||
pub const SCHED_OTHER: ::c_int = 2;
|
||||
|
|
|
@ -270,7 +270,12 @@ pub const ST_NOSUID: ::c_ulong = 2;
|
|||
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
|
||||
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
|
||||
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = 0 as *mut _;
|
||||
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
|
||||
pub const PTHREAD_MUTEX_STRICT_NP: ::c_int = 4;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_STRICT_NP;
|
||||
|
||||
pub const TMP_MAX : ::c_uint = 0x7fffffff;
|
||||
|
||||
|
|
|
@ -345,7 +345,10 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
|
|||
ptr_owner: 0,
|
||||
ptr_private: 0 as *mut _,
|
||||
};
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
|
||||
|
||||
pub const EVFILT_AIO: ::int16_t = 2;
|
||||
pub const EVFILT_PROC: ::int16_t = 4;
|
||||
|
|
|
@ -239,7 +239,12 @@ pub const ST_NOSUID: ::c_ulong = 2;
|
|||
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
|
||||
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
|
||||
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = 0 as *mut _;
|
||||
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
|
||||
pub const PTHREAD_MUTEX_STRICT_NP: ::c_int = 4;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_STRICT_NP;
|
||||
|
||||
pub const TMP_MAX : ::c_uint = 0x7fffffff;
|
||||
|
||||
|
|
|
@ -122,6 +122,8 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
|
|||
__reserved: [0; 12],
|
||||
};
|
||||
pub const PTHREAD_STACK_MIN: ::size_t = 4096 * 2;
|
||||
pub const CPU_SETSIZE: ::size_t = 32;
|
||||
pub const __CPU_BITS: ::size_t = 32;
|
||||
|
||||
extern {
|
||||
pub fn timegm64(tm: *const ::tm) -> ::time64_t;
|
||||
|
|
|
@ -132,6 +132,8 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
|
|||
__reserved: [0; 36],
|
||||
};
|
||||
pub const PTHREAD_STACK_MIN: ::size_t = 4096 * 4;
|
||||
pub const CPU_SETSIZE: ::size_t = 1024;
|
||||
pub const __CPU_BITS: ::size_t = 64;
|
||||
|
||||
extern {
|
||||
pub fn timegm(tm: *const ::tm) -> ::time64_t;
|
||||
|
|
|
@ -165,7 +165,10 @@ pub const _SC_THREAD_PRIO_PROTECT: ::c_int = 84;
|
|||
pub const _SC_THREAD_SAFE_FUNCTIONS: ::c_int = 85;
|
||||
pub const _SC_NPROCESSORS_ONLN: ::c_int = 97;
|
||||
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
|
||||
|
||||
pub const FIOCLEX: ::c_int = 0x5451;
|
||||
|
||||
|
@ -468,11 +471,6 @@ pub const RTLD_NOLOAD: ::c_int = 0x4;
|
|||
pub const RTLD_NOW: ::c_int = 0;
|
||||
pub const RTLD_DEFAULT: *mut ::c_void = -1isize as *mut ::c_void;
|
||||
|
||||
#[cfg(target_pointer_width = "64")] pub const CPU_SETSIZE: ::size_t = 1024;
|
||||
#[cfg(target_pointer_width = "32")] pub const CPU_SETSIZE: ::size_t = 32;
|
||||
#[cfg(target_pointer_width = "64")] pub const __CPU_BITS: ::size_t = 64;
|
||||
#[cfg(target_pointer_width = "32")] pub const __CPU_BITS: ::size_t = 32;
|
||||
|
||||
f! {
|
||||
pub fn sigemptyset(set: *mut sigset_t) -> ::c_int {
|
||||
*set = 0;
|
||||
|
|
|
@ -401,7 +401,10 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
|
|||
__align: [],
|
||||
size: [0; __SIZEOF_PTHREAD_RWLOCK_T],
|
||||
};
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
|
||||
pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
|
||||
|
||||
pub const SCHED_OTHER: ::c_int = 0;
|
||||
|
|
|
@ -499,6 +499,12 @@ extern {
|
|||
pub fn getpriority(which: ::__priority_which_t, who: ::id_t) -> ::c_int;
|
||||
pub fn setpriority(which: ::__priority_which_t, who: ::id_t,
|
||||
prio: ::c_int) -> ::c_int;
|
||||
pub fn pthread_getaffinity_np(thread: ::pthread_t,
|
||||
cpusetsize: ::size_t,
|
||||
cpuset: *mut ::cpu_set_t) -> ::c_int;
|
||||
pub fn pthread_setaffinity_np(thread: ::pthread_t,
|
||||
cpusetsize: ::size_t,
|
||||
cpuset: *const ::cpu_set_t) -> ::c_int;
|
||||
}
|
||||
|
||||
cfg_if! {
|
||||
|
|
|
@ -831,7 +831,10 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
|
|||
__pthread_rwlock_readercv: PTHREAD_COND_INITIALIZER,
|
||||
__pthread_rwlock_writercv: PTHREAD_COND_INITIALIZER
|
||||
};
|
||||
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
|
||||
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
|
||||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 4;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
|
||||
|
||||
f! {
|
||||
pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
|
||||
|
|
Loading…
Reference in a new issue