From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 17 Jun 2011 09:59:53 +0000 (+0000)
Subject: Different flex version, no warning about signed and unsigned comparison.
X-Git-Tag: release-1.4.11rc2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ecb52c5325a6a9100246edd369b03c8a4de1401;p=thirdparty%2Funbound.git

Different flex version, no warning about signed and unsigned comparison.


git-svn-id: file:///svn/unbound/trunk@2433 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/util/configlexer.c b/util/configlexer.c
index a179e1ad6..ff38854fd 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1624,7 +1624,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1635,7 +1635,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \