[Asterisk-code-review] Build System: Add missing ASTMM LIBC to flex output. (asterisk[master])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8819 )

Change subject: Build System: Add missing ASTMM_LIBC to flex output.
......................................................................

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
---
M main/Makefile
M res/Makefile
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/main/Makefile b/main/Makefile
index bef70e9..393ad1a 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -135,7 +135,8 @@
 	$(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 ecaa03d..ec3417b 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -45,7 +45,8 @@
 	$(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

-- 
To view, visit https://gerrit.asterisk.org/8819
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7263e9e4217a17bde4ffaa2087a8f8aeb2a8588c
Gerrit-Change-Number: 8819
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180425/4c5222b7/attachment-0001.html>