rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #30525 - semarie:ncpu, r=alexcrichton

Browse Source 
Should unbreak build (well, remove one reason to break) for *bsd target.

r? @alexcrichton
This commit is contained in:
bors
2015-12-23 15:19:54 +00:00
parent 4ce1dafd1d 3beb4b1a6c
commit 8037e62d29
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtest/lib.rs
View File

@@ -923,21 +923,21 @@ fn get_concurrency() -> usize {
target_os = "netbsd"))] target_os = "netbsd"))]
fn num_cpus() -> usize { fn num_cpus() -> usize {
let mut cpus: libc::c_uint = 0; let mut cpus: libc::c_uint = 0;
let mut CPUS_SIZE = std::mem::size_of_val(&cpus); let mut cpus_size = std::mem::size_of_val(&cpus);
let mut mib = [libc::CTL_HW, libc::HW_AVAILCPU, 0, 0]; let mut mib = [libc::CTL_HW, libc::HW_AVAILCPU, 0, 0];
unsafe { unsafe {
libc::sysctl(mib.as_mut_ptr(), 2, libc::sysctl(mib.as_mut_ptr(), 2,
&mut cpus as *mut _ as *mut _, &mut cpus as *mut _ as *mut _,
&mut CPUS_SIZE as *mut _ as *mut _, &mut cpus_size as *mut _ as *mut _,
0 as *mut _, 0); 0 as *mut _, 0);
} }
if cpus < 1 { if cpus < 1 {
mib[1] = HW_NCPU; mib[1] = libc::HW_NCPU;
unsafe { unsafe {
libc::sysctl(mib.as_mut_ptr(), 2, libc::sysctl(mib.as_mut_ptr(), 2,
&mut cpus as *mut _ as *mut _, &mut cpus as *mut _ as *mut _,
&mut CPUS_SIZE as *mut _ as *mut _, &mut cpus_size as *mut _ as *mut _,
0 as *mut _, 0); 0 as *mut _, 0);
} }
if cpus < 1 { if cpus < 1 {