diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-02-28 11:16:06 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-02-28 11:16:06 +0000 |
| commit | e5dc4c2d8efbff77f4060fe9e6430f9e39947317 (patch) | |
| tree | 86e3bc1b3cf282c7e87576d7f636bca0500eb922 /main/ast_expr2.fl | |
| parent | 008aa0e3b8bbd962ef9e25feab3c87421c0c3344 (diff) | |
Merged revisions 309035 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r309035 | tilghman | 2011-02-28 05:10:28 -0600 (Mon, 28 Feb 2011) | 15 lines
Merged revisions 309033-309034 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r309033 | tilghman | 2011-02-28 04:43:12 -0600 (Mon, 28 Feb 2011) | 4 lines
A later version of flex already includes the fwrite workaround code, which if used twice causes a compilation error.
Detect whether Flex will compile without the workaround; if so, suppress our workaround code.
........
r309034 | tilghman | 2011-02-28 05:07:52 -0600 (Mon, 28 Feb 2011) | 2 lines
Clarify meaning, removing double negative (stupid!)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ast_expr2.fl')
| -rw-r--r-- | main/ast_expr2.fl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 614f8486f..75b3e7632 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -65,10 +65,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #endif -/*!\note The latest Flex uses fwrite without checking its return value, which +#ifdef NEED_FLEX_FWRITE_WORKAROUND +/*!\note Some versions of Flex use fwrite without checking its return value, which * is a warning on some compilers. Therefore, we use this workaround, to trick * the compiler into suppressing this warning. */ #define fwrite(a,b,c,d) do { int __res = fwrite(a,b,c,d); (__res); } while (0) +#endif enum valtype { AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string |