diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-10 20:45:05 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-10 20:45:05 +0000 |
| commit | 8358b5cbc05a6debe45b4ccd9bdf14ef52a62a25 (patch) | |
| tree | 532e93b3ebd132ebab91989ac8de66405f72a52f /main/Makefile | |
| parent | 8c685c6a427ef86e8074d7c2042fd97379bf52b4 (diff) | |
Merged revisions 97849 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r97849 | murf | 2008-01-10 13:21:27 -0700 (Thu, 10 Jan 2008) | 1 line
This is a fix for 2 things: a problem Terry was having in OSX with null pointers, which was my fault, as I probably forgot to run the sed script last time I made mods. So, I moved the fix into the flex input itself. Then, I found when I used flex 2.5.33, that it was using __STDC_VERSION__, and that's not real good; so I added back in a DIFFERENT sed script to fix that little mess. Tested everything, a couple different ways. Hope I did no harm, at the least.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@97850 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index 93a306e8e..9389ee3f6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -117,8 +117,8 @@ ast_expr2.c ast_expr2.h: bison -o $@ -d --name-prefix=ast_yy ast_expr2.y ast_expr2f.c: - flex -o $@ --full ast_expr2.fl - sed 's@free( (char \*) ptr );@if(ptr) free( (char *) ptr );@' ast_expr2f.c > zz + flex -o $@ --full ast_expr2.fl # moved the correction of yyfree into the flex input file itself. + sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz mv zz ast_expr2f.c testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h |