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 e5202bb58c92835e9cc8ac9ab07de6318edf474b..20f5aa9d4f5360d78c85c1c9412e96a63d54bfe0 100644 (file)
--- 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 f5ce26f0acc109a09330998e8bc24f3ab1bb5c55..b0eb51bf58e6d8301f33ce083351295bab3da77e 100644 (file)
--- 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 a31172b27b48009c98126bbfff6124293de1b02b..a2d3c3dc5f49e88b665f7bead439d26d1b944978 100644 (file)
--- 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 f072dcd5779c6f77a36061b861cb5ac16ef1d35b..f259f6884debe06a51092d1eafcb748cb076f6fe 100644 (file)
--- 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>