fix bugs caused by r144949 when MALLOC_DEBUG is defined
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@144950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
629861a705
commit
fa2f4776a2
|
@ -29,9 +29,14 @@ all: $(AGIS)
|
||||||
|
|
||||||
strcompat.c: ../main/strcompat.c
|
strcompat.c: ../main/strcompat.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
strcompat.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
|
eagi-test.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
eagi-test: eagi-test.o strcompat.o
|
eagi-test: eagi-test.o strcompat.o
|
||||||
|
|
||||||
|
eagi-sphinx-test.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
eagi-sphinx-test: eagi-sphinx-test.o
|
eagi-sphinx-test: eagi-sphinx-test.o
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
|
|
|
@ -27,6 +27,13 @@
|
||||||
|
|
||||||
#include "asterisk.h"
|
#include "asterisk.h"
|
||||||
|
|
||||||
|
/* Include these now to prevent them from being needed later */
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
/* Undefine any macros */
|
/* Undefine any macros */
|
||||||
#undef malloc
|
#undef malloc
|
||||||
#undef calloc
|
#undef calloc
|
||||||
|
|
|
@ -82,52 +82,44 @@ clean:
|
||||||
|
|
||||||
md5.c: $(ASTTOPDIR)/main/md5.c
|
md5.c: $(ASTTOPDIR)/main/md5.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
md5.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
astman: astman.o md5.o
|
astman: astman.o md5.o
|
||||||
astman: LIBS+=$(NEWT_LIB)
|
astman: LIBS+=$(NEWT_LIB)
|
||||||
astman.o: ASTCFLAGS+=-DNO_MALLOC_DEBUG
|
astman.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
stereorize: stereorize.o frame.o
|
stereorize: stereorize.o frame.o
|
||||||
stereorize: LIBS+=-lm
|
stereorize: LIBS+=-lm
|
||||||
|
|
||||||
hashtab.c: $(ASTTOPDIR)/main/hashtab.c
|
hashtab.c: $(ASTTOPDIR)/main/hashtab.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
hashtab.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
strcompat.c: $(ASTTOPDIR)/main/strcompat.c
|
strcompat.c: $(ASTTOPDIR)/main/strcompat.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
strcompat.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
$(ASTTOPDIR)/main/ast_expr2.c:
|
|
||||||
@echo " [BISON] $(ASTTOPDIR)/main/ast_expr2.y -> $@"
|
|
||||||
@bison -o $@ -d --name-prefix=ast_yy $(ASTTOPDIR)/main/ast_expr2.y
|
|
||||||
|
|
||||||
$(ASTTOPDIR)/main/ast_expr2f.c:
|
|
||||||
@echo " [FLEX] $(ASTTOPDIR)/main/ast_expr2.fl -> $@"
|
|
||||||
@flex -o $@ --full $(ASTTOPDIR)/main/ast_expr2.fl
|
|
||||||
|
|
||||||
pval.c: $(ASTTOPDIR)/res/ael/pval.c
|
pval.c: $(ASTTOPDIR)/res/ael/pval.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
pval.o : ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
ast_expr2.c: $(ASTTOPDIR)/main/ast_expr2.c
|
ast_expr2.c: $(ASTTOPDIR)/main/ast_expr2.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
|
||||||
ast_expr2.o: ASTCFLAGS+=-DSTANDALONE
|
ast_expr2.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
ast_expr2f.c: $(ASTTOPDIR)/main/ast_expr2f.c
|
ast_expr2f.c: $(ASTTOPDIR)/main/ast_expr2f.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
|
||||||
ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE -I$(ASTTOPDIR)/main -Wno-unused
|
ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE -I$(ASTTOPDIR)/main -Wno-unused
|
||||||
|
|
||||||
pval.o : ASTCFLAGS+=-DSTANDALONE
|
|
||||||
|
|
||||||
check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o threadstorage.o clicompat.o
|
check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o threadstorage.o clicompat.o
|
||||||
|
check_expr.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
aelbison.c: $(ASTTOPDIR)/res/ael/ael.tab.c
|
aelbison.c: $(ASTTOPDIR)/res/ael/ael.tab.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
|
||||||
aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 -DSTANDALONE
|
aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 -DSTANDALONE
|
||||||
|
|
||||||
pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c
|
pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
|
||||||
pbx_ael.o: ASTCFLAGS+=-DSTANDALONE
|
pbx_ael.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c
|
aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c
|
||||||
|
@ -136,32 +128,32 @@ aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c
|
||||||
ael_main.o: ASTCFLAGS+=-DSTANDALONE
|
ael_main.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused
|
aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused
|
||||||
|
|
||||||
aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
|
aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
|
||||||
|
|
||||||
astobj2.c: $(ASTTOPDIR)/main/astobj2.c
|
astobj2.c: $(ASTTOPDIR)/main/astobj2.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
astobj2.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
utils.c: $(ASTTOPDIR)/main/utils.c
|
utils.c: $(ASTTOPDIR)/main/utils.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
utils.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
sha1.c: $(ASTTOPDIR)/main/sha1.c
|
sha1.c: $(ASTTOPDIR)/main/sha1.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
sha1.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
|
threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
|
||||||
@cp $< $@
|
@cp $< $@
|
||||||
|
threadstorage.o: ASTCFLAGS+=-DSTANDALONE
|
||||||
|
|
||||||
hashtest2.o: ASTCFLAGS+=-O0
|
hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE
|
||||||
|
|
||||||
hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
|
hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
|
||||||
|
|
||||||
hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
|
hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
|
||||||
|
hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE
|
||||||
hashtest.o: ASTCFLAGS+=-O0
|
|
||||||
|
|
||||||
refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
|
refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
|
||||||
|
refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE
|
||||||
refcounter.o: ASTCFLAGS+=-O0
|
|
||||||
|
|
||||||
extconf.o: extconf.c
|
extconf.o: extconf.c
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue