Merge branch 'v0.10'

Conflicts:
	ChangeLog
	src/unix/linux-core.c
	src/version.c
This commit is contained in:
Fedor Indutny 2014-01-29 17:02:25 +04:00
commit 923e4ec619

View File

@ -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++);
}