]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #24376: lambdaburrito/master
authorAlex Crichton <alex@alexcrichton.com>
Tue, 14 Apr 2015 17:55:48 +0000 (10:55 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 14 Apr 2015 17:55:48 +0000 (10:55 -0700)
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


Trivial merge