Auto merge of #28249 - stepancheg:get-num-cpus, r=huonw

No need to export this symbol. `rust_get_num_cpus` is exported.
This commit is contained in:
bors 2015-09-05 12:47:47 +00:00
commit 205c356ace
1 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@ rust_dirent_t_size() {
}
#if defined(__BSD__)
int
static int
get_num_cpus() {
/* swiped from http://stackoverflow.com/questions/150355/
programmatically-find-the-number-of-cores-on-a-machine */
@ -110,7 +110,7 @@ get_num_cpus() {
return numCPU;
}
#elif defined(__GNUC__)
int
static int
get_num_cpus() {
return sysconf(_SC_NPROCESSORS_ONLN);
}