Merge branch 'master' into freebsd

This commit is contained in:
Hisham Muhammad
2014-11-27 20:10:53 -02:00
5 changed files with 21 additions and 9 deletions

View File

@ -54,3 +54,7 @@ void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
*five = 0;
*fifteen = 0;
}
int Platform_getMaxPid() {
return -1;
}