diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 15:13:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 15:13:30 +0000 |
| commit | ca1d07ab9a8d24698f319accdefb7722fb9f8dee (patch) | |
| tree | a71cbef08dbc2c48f9db3fdf2772e22dfccd00bb | |
| parent | 3be602e6c84bd15d5399be3352435b49e1329500 (diff) | |
fix some minor issues with rev 144924
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@144925 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk.h | 2 | ||||
| -rw-r--r-- | main/astmm.c | 4 | ||||
| -rw-r--r-- | utils/Makefile | 1 | ||||
| -rw-r--r-- | utils/astman.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index e5202bb58..20f5aa9d4 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 f5ce26f0a..b0eb51bf5 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 a31172b27..a2d3c3dc5 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 f072dcd57..f259f6884 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> |