aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 23:41:38 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 23:41:38 +0000
commit06106616f758341db11cb08c7e2cc5aacef72bfd (patch)
treedd51b621653e563673c7963f9196b3f21d9dd754
parent6e1d51e8dbf27be0a158b9eb67c645231b79c205 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@243060 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/ast_expr2.fl5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index 92345e975..aa5d59e9b 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
} ;