Skip to content

Fix for #24374 #24376

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

Merged
merged 2 commits into from
Apr 15, 2015
+11 −0
Merged

Fix for #24374 #24376

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f54ce9
added _SC_NPROCESSORS_ONLN constants for linux and macos for fix #24374
oh-its-jimjam Apr 13, 2015
883bb65
remove duplicated linux sysconf mod
oh-its-jimjam Apr 13, 2015
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
11 changes: 11 additions & 0 deletions src/liblibc/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -3344,6 +3344,8 @@ pub mod consts {
pub const _SC_XOPEN_REALTIME : c_int = 130;
pub const _SC_XOPEN_REALTIME_THREADS : c_int = 131;



pub const PTHREAD_CREATE_JOINABLE: c_int = 0;
pub const PTHREAD_CREATE_DETACHED: c_int = 1;

@@ -3727,12 +3729,14 @@ pub mod consts {
pub const _SC_2_FORT_RUN : c_int = 50;
pub const _SC_2_SW_DEV : c_int = 51;
pub const _SC_2_LOCALEDEF : c_int = 52;
pub const _SC_NPROCESSORS_ONLN : c_int = 84;
pub const _SC_2_CHAR_TERM : c_int = 95;
pub const _SC_2_C_VERSION : c_int = 96;
pub const _SC_2_UPE : c_int = 97;
pub const _SC_XBS5_ILP32_OFF32 : c_int = 125;
pub const _SC_XBS5_ILP32_OFFBIG : c_int = 126;
pub const _SC_XBS5_LPBIG_OFFBIG : c_int = 128;

}
#[cfg(target_os = "nacl")]
pub mod sysconf {
@@ -3742,6 +3746,13 @@ pub mod consts {
pub static _SC_NPROCESSORS_ONLN : c_int = 1;
pub static _SC_PAGESIZE : c_int = 2;
}

#[cfg(target_os = "macos")]
pub mod sysconf {
use types::os::arch::c95::c_int;
pub static _SC_NPROCESSORS_ONLN : c_int = 58;
}

#[cfg(target_os = "android")]
pub mod sysconf {
use types::os::arch::c95::c_int;