From: Tilghman Lesher Date: Mon, 25 Jan 2010 23:41:38 +0000 (+0000) Subject: Merged revisions 239920 via svnmerge from X-Git-Tag: 1.6.0.23~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5e481d1fe9b1258aa818240fa3c7bfb040fb5fd;p=thirdparty%2Fasterisk.git Merged revisions 239920 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r239920 | tilghman | 2010-01-13 14:38:42 -0600 (Wed, 13 Jan 2010) | 2 lines Flex uses fwrite incorrectly, which breaks the build. Providing a workaround. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@243060 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 92345e9750..aa5d59e9bf 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -65,6 +65,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #endif +/*!\note The latest Flex uses 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) + enum valtype { AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string } ;