[asterisk-commits] kpfleming: branch 1.4 r144925 - in /branches/1.4: include/ main/ utils/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Sat Sep 27 10:13:30 2008
New Revision: 144925

URL: http://svn.digium.com/view/asterisk?view=rev&rev=144925
Log:
fix some minor issues with rev 144924

Modified:
    branches/1.4/include/asterisk.h
    branches/1.4/main/astmm.c
    branches/1.4/utils/Makefile
    branches/1.4/utils/astman.c

Modified: branches/1.4/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk.h?view=diff&rev=144925&r1=144924&r2=144925
==============================================================================
--- branches/1.4/include/asterisk.h (original)
+++ branches/1.4/include/asterisk.h Sat Sep 27 10:13:30 2008
@@ -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
 

Modified: branches/1.4/main/astmm.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/astmm.c?view=diff&rev=144925&r1=144924&r2=144925
==============================================================================
--- branches/1.4/main/astmm.c (original)
+++ branches/1.4/main/astmm.c Sat Sep 27 10:13:30 2008
@@ -23,9 +23,9 @@
  * \author Mark Spencer <markster at digium.com>
  */
 
+#include "asterisk.h"
+
 #ifdef __AST_DEBUG_MALLOC
-
-#include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 

Modified: branches/1.4/utils/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/utils/Makefile?view=diff&rev=144925&r1=144924&r2=144925
==============================================================================
--- branches/1.4/utils/Makefile (original)
+++ branches/1.4/utils/Makefile Sat Sep 27 10:13:30 2008
@@ -65,6 +65,7 @@
 
 astman: astman.o md5.o
 astman: LIBS+=$(NEWT_LIB)
+astman.o: ASTCFLAGS+=-DNO_MALLOC_DEBUG
 
 stereorize: stereorize.o frame.o
 stereorize: LIBS+=-lm

Modified: branches/1.4/utils/astman.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/utils/astman.c?view=diff&rev=144925&r1=144924&r2=144925
==============================================================================
--- branches/1.4/utils/astman.c (original)
+++ branches/1.4/utils/astman.c Sat Sep 27 10:13:30 2008
@@ -22,6 +22,8 @@
  *
  */
  
+#include "asterisk.h"
+
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>