Merge branch 'v0.10'
Conflicts: ChangeLog src/unix/linux-core.c src/version.c
This commit is contained in:
commit
923e4ec619
@ -638,7 +638,7 @@ static int read_times(unsigned int numcpus, uv_cpu_info_t* ci) {
|
||||
unsigned int n;
|
||||
int r = sscanf(buf, "cpu%u ", &n);
|
||||
assert(r == 1);
|
||||
(void) r; // silence build warning
|
||||
(void) r; /* silence build warning */
|
||||
for (len = sizeof("cpu0"); n /= 10; len++);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user