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.

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
Merged

Fix for #24374 #24376

merged 2 commits into from
Apr 15, 2015

Conversation

oh-its-jimjam
Copy link
Contributor

Values for _SC_* are not the same value between macos and linux so I've added specific target constants for Mac OS X and added _SC_NPROCESSORS_ONLN for linux and macos.

Closes #24374

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

@alexcrichton
Copy link
Member

@bors: r+ 883bb65

Thanks!

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Apr 14, 2015
Values for `_SC_*` are not the same value between `macos` and `linux` so I've added specific target constants for Mac OS X and added `_SC_NPROCESSORS_ONLN` for `linux` and `macos`.

Closes rust-lang#24374
@bors bors merged commit 883bb65 into rust-lang:master Apr 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add _SC_NPROCESSORS_ONLN constants for linux and macos
5 participants