Build System: Add missing ASTMM_LIBC to flex output.

Redirect libc allocation functions to use Asterisk functions for
main/ast_expr2f.c and res/ael/ael_lex.c.  This will resolve errors
produced by astmm.h when these files are regenerated, though other
issues still remain.

ASTERISK~27813

Change-Id: I7263e9e4217a17bde4ffaa2087a8f8aeb2a8588c

diff --git a/main/Makefile b/main/Makefile
index 741ea39b9759b28f4eabfbbee4369a4d01fe3061..fad5ee6f5d7c6f5a0015107583a83ac248bcad11 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -134,7 +134,8 @@ endif
        $(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
        $(CMD_PREFIX) $(FLEX) -o $@ ast_expr2.fl
        $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
-       $(CMD_PREFIX) echo "#include \"asterisk.h\"" > $@
+       $(CMD_PREFIX) echo "#define ASTMM_LIBC ASTMM_REDIRECT" > $@
+       $(CMD_PREFIX) echo "#include \"asterisk.h\"" >> $@
        $(CMD_PREFIX) echo >> $@
        $(CMD_PREFIX) cat $@.fix >> $@
        $(CMD_PREFIX) rm $@.fix

diff --git a/res/Makefile b/res/Makefile
index ecaa03d3c810b20f0639afc55ccafa9db3be543f..ec3417b35be8cd211a4e19d36089ce7c5cebffca 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -45,7 +45,8 @@ endif
        $(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
        $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex)
        $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
-       $(CMD_PREFIX) echo "#include \"asterisk.h\"" > $@
+       $(CMD_PREFIX) echo "#define ASTMM_LIBC ASTMM_REDIRECT" > $@
+       $(CMD_PREFIX) echo "#include \"asterisk.h\"" >> $@
        $(CMD_PREFIX) echo >> $@
        $(CMD_PREFIX) cat $@.fix >> $@
        $(CMD_PREFIX) rm $@.fix