diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 20:49:25 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 20:49:25 +0000 |
| commit | 5f91a9cc12b2f0fca404b5e28fde518674f87dda (patch) | |
| tree | a7ddc3594a583d4c4f93fa56898c28b05324399f | |
| parent | 313cfcaa4174a08dfe7785049134977fc1376f0e (diff) | |
Fix build issues on Linux after sysinfo related changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@164821 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/asterisk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 1c41b8a4e..2b3832a4d 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -538,7 +538,7 @@ static int swapmode(int *used, int *total) ast_free(swdev); return 1; } -#elif defined(HAVE_SYSCTL) +#elif defined(HAVE_SYSCTL) && !defined(HAVE_SYSINFO) static int swapmode(int *used, int *total) { used = total = 0; @@ -554,13 +554,13 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl long uptime = 0; #if defined(HAVE_SYSINFO) struct sysinfo sys_info; - sysinfo(&sys_info) + sysinfo(&sys_info); uptime = sys_info.uptime/3600; physmem = sys_info.totalram * sys_info.mem_unit; freeram = (sys_info.freeram * sys_info.mem_unit) / 1024; totalswap = (sys_info.totalswap * sys_info.mem_unit) / 1024; freeswap = (sys_info.freeswap * sys_info.mem_unit) / 1024; - nprocs = sys_info.nprocs; + nprocs = sys_info.procs; #elif defined(HAVE_SYSCTL) static int pageshift; struct vmtotal vmtotal; |