[svn-commits] tilghman: branch 1.6.0 r243060 - in /branches/1.6.0: ./ main/ast_expr2.fl

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Jan 25 17:41:38 2010
New Revision: 243060

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243060
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/ast_expr2.fl

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/ast_expr2.fl
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/ast_expr2.fl?view=diff&rev=243060&r1=243059&r2=243060
==============================================================================
--- branches/1.6.0/main/ast_expr2.fl (original)
+++ branches/1.6.0/main/ast_expr2.fl Mon Jan 25 17:41:38 2010
@@ -64,6 +64,11 @@
 #include "asterisk/strings.h"
 #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