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

bors · bors · commit 205c356ace55 · 2015-09-05T12:47:47.000Z
No need to export this symbol. `rust_get_num_cpus` is exported.
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ rust_dirent_t_size() {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`#if defined(__BSD__)`
`86`		`-int`
	`86`	`+static int`
`87`	`87`	`get_num_cpus() {`
`88`	`88`	`/* swiped from http://stackoverflow.com/questions/150355/`
`89`	`89`	`programmatically-find-the-number-of-cores-on-a-machine */`
`@@ -110,7 +110,7 @@ get_num_cpus() {`
`110`	`110`	`return numCPU;`
`111`	`111`	`}`
`112`	`112`	`#elif defined(__GNUC__)`
`113`		`-int`
	`113`	`+static int`
`114`	`114`	`get_num_cpus() {`
`115`	`115`	`return sysconf(_SC_NPROCESSORS_ONLN);`
`116`	`116`	`}`