diff options
author | Steve Murphy <murf@digium.com> | 2008-01-10 21:46:56 +0000 |
---|---|---|
committer | Steve Murphy <murf@digium.com> | 2008-01-10 21:46:56 +0000 |
commit | 3f152e5ff0ee6fe26419814421cc5c576d49e5fa (patch) | |
tree | 53726aa04261f72d5fda00bd7e315437501cfa25 /res/Makefile | |
parent | 33fadcc67cdca80058255e2b8b35720170fab7b3 (diff) |
Merged revisions 97889 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r97889 | murf | 2008-01-10 14:37:10 -0700 (Thu, 10 Jan 2008) | 1 line
Applied the same fixes for ael.flex as was done in 97849 for ast_expr2.fl; overrode the normally generate yyfree func with our own version that checks the pointer for non-null before passing to free(). Also takes care of a little problem with 2.5.33 and the use of the __STDC_VERSION__ macro.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/Makefile')
-rw-r--r-- | res/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/Makefile b/res/Makefile index cfac3183a..72f4e8ae0 100644 --- a/res/Makefile +++ b/res/Makefile @@ -41,6 +41,7 @@ $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ae ael/ael_lex.c: (cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) + (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) ael/ael.tab.c ael/ael.tab.h: (cd ael; bison -v -d ael.y) |