diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-04-25 10:02:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-04-25 10:02:13 -0500 |
| commit | 56a9338fc1fa6dacd8c7cb7a770dbb3a7f3c8ff8 (patch) | |
| tree | 6bcda317d1a2924be7672825f72235734c45fba2 | |
| parent | bf692f2dc3266b3a7f7c801bf69c14a7c30096fd (diff) | |
| parent | 179ae87cf4d28b4a4c2fb793e007196068ea8abf (diff) | |
Merge "Build System: Add missing ASTMM_LIBC to flex output."
| -rw-r--r-- | main/Makefile | 3 | ||||
| -rw-r--r-- | res/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index bef70e966..393ad1aa4 100644 --- a/main/Makefile +++ b/main/Makefile @@ -135,7 +135,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 ecaa03d3c..ec3417b35 100644 --- 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 |