summaryrefslogtreecommitdiff
path: root/main/pbx.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-08-01 19:37:59 +0000
committerJoshua Colp <jcolp@digium.com>2007-08-01 19:37:59 +0000
commit1e4bd7a192e513507ed864488dc90ab5de8060df (patch)
tree6d5a9eef20c02cf9420917da3379de99d344b8a6 /main/pbx.c
parenta7aaa0bbc2ba755d2a0ba13870044d4a9e1a7735 (diff)
Instead of adding the SOLARIS check to each HAVE_SYSINFO check let's just make the sysinfo autoconf logic a bit pickier about what it considers a usable sysinfo.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
-rw-r--r--main/pbx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/pbx.c b/main/pbx.c
index b2e6c7048..419523db9 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <time.h>
#include <sys/time.h>
#include <limits.h>
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
#include <sys/sysinfo.h>
#endif
@@ -2536,7 +2536,7 @@ static int increase_call_count(const struct ast_channel *c)
{
int failed = 0;
double curloadavg;
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
long curfreemem;
struct sysinfo sys_info;
#endif
@@ -2555,7 +2555,7 @@ static int increase_call_count(const struct ast_channel *c)
failed = -1;
}
}
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
if (option_minmemfree) {
if (!sysinfo(&sys_info)) {
/* make sure that the free system memory is above the configured low watermark