From: Kevin P. Fleming <kpfleming@digium.com>
Date: Sat, 27 Sep 2008 15:13:30 +0000 (+0000)
Subject: fix some minor issues with rev 144924
X-Git-Tag: 1.4.23-rc1~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d10c4137fb31831a0220af2dfb955ba00ffeb5aa;p=thirdparty%2Fasterisk.git

fix some minor issues with rev 144924


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@144925 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk.h b/include/asterisk.h
index e5202bb58c..20f5aa9d4f 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -20,7 +20,7 @@
 
 #include "asterisk/autoconfig.h"
 
-#if !defined(STANDALONE_AEL) && defined(MALLOC_DEBUG)
+#if !defined(NO_MALLOC_DEBUG) && !defined(STANDALONE_AEL) && defined(MALLOC_DEBUG)
 #include "asterisk/astmm.h"
 #endif
 
diff --git a/main/astmm.c b/main/astmm.c
index f5ce26f0ac..b0eb51bf58 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -23,10 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
-#ifdef __AST_DEBUG_MALLOC
-
 #include "asterisk.h"
 
+#ifdef __AST_DEBUG_MALLOC
+
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <stdio.h>
diff --git a/utils/Makefile b/utils/Makefile
index a31172b27b..a2d3c3dc5f 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -65,6 +65,7 @@ md5.c: ../main/md5.c
 
 astman: astman.o md5.o
 astman: LIBS+=$(NEWT_LIB)
+astman.o: ASTCFLAGS+=-DNO_MALLOC_DEBUG
 
 stereorize: stereorize.o frame.o
 stereorize: LIBS+=-lm
diff --git a/utils/astman.c b/utils/astman.c
index f072dcd577..f259f6884d 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -22,6 +22,8 @@
  *
  */
  
+#include "asterisk.h"
+
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>