From 53f788c6b56cbc4498b65153b9cf5a080f2f2599 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 16 Dec 2008 20:49:25 +0000 Subject: [PATCH] Fix build issues on Linux after sysinfo related changes git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@164821 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index 1c41b8a4e8..2b3832a4d1 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;