diff options
| author | bors <bors@rust-lang.org> | 2015-09-05 12:47:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-05 12:47:47 +0000 |
| commit | 205c356ace559f511d5b7e51fd6b8c46bb4cc1ea (patch) | |
| tree | 7f1404004cc3d534c1ebeea8d9121e4350936269 /src | |
| parent | 5c2cfdfb79d3be18ee50f5b5a60205d040c8396a (diff) | |
| parent | 6ca5d52bd2888b0871c9e94da2cd3d5cba796a3a (diff) | |
| download | rust-205c356ace559f511d5b7e51fd6b8c46bb4cc1ea.tar.gz rust-205c356ace559f511d5b7e51fd6b8c46bb4cc1ea.zip | |
Auto merge of #28249 - stepancheg:get-num-cpus, r=huonw
No need to export this symbol. `rust_get_num_cpus` is exported.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/rust_builtin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c index 37ce30d7066..cf497438a6b 100644 --- a/src/rt/rust_builtin.c +++ b/src/rt/rust_builtin.c @@ -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); } |
