Module Name:    src
Committed By:   christos
Date:           Tue Oct 27 01:44:01 UTC 2009

Modified Files:
        src/external/bsd/flex/dist: flex.skl gen.c

Log Message:
Fixes to pass -Wall


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/gen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/flex/dist/flex.skl
diff -u src/external/bsd/flex/dist/flex.skl:1.1.1.1 src/external/bsd/flex/dist/flex.skl:1.2
--- src/external/bsd/flex/dist/flex.skl:1.1.1.1	Sun Oct 25 20:26:13 2009
+++ src/external/bsd/flex/dist/flex.skl	Mon Oct 26 21:44:01 2009
@@ -994,10 +994,12 @@
 #endif
 
 %not-for-header
+#ifndef YY_NO_UNPUT
     m4_ifdef( [[M4_YY_NO_UNPUT]],,
     [[
     static void yyunput M4_YY_PARAMS( int c, char *buf_ptr  M4_YY_PROTO_LAST_ARG);
     ]])
+#endif
 %ok-for-header
 %endif
 
@@ -1092,7 +1094,7 @@
 %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \
 \
 %if-c++-only C++ definition \
-	if ( (result = LexerInput( (char *) buf, max_size )) < 0 ) \
+	if ( (int)(result = LexerInput( (char *) buf, max_size )) < 0 ) \
 		YY_FATAL_ERROR( "input in flex scanner failed" );
 %endif
 
@@ -1768,6 +1770,7 @@
 }
 
 
+#ifndef YY_NO_UNPUT
 %if-c-only
 m4_ifdef( [[M4_YY_NO_UNPUT]],,
 [[
@@ -1823,6 +1826,7 @@
 %if-c-only
 ]])
 %endif
+#endif
 
 %if-c-only
 #ifndef YY_NO_INPUT

Index: src/external/bsd/flex/dist/gen.c
diff -u src/external/bsd/flex/dist/gen.c:1.3 src/external/bsd/flex/dist/gen.c:1.4
--- src/external/bsd/flex/dist/gen.c:1.3	Mon Oct 26 15:23:33 2009
+++ src/external/bsd/flex/dist/gen.c	Mon Oct 26 21:44:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: gen.c,v 1.3 2009/10/26 19:23:33 christos Exp $	*/
+/*	$NetBSD: gen.c,v 1.4 2009/10/27 01:44:01 christos Exp $	*/
 
 /* gen - actual generation (writing) of flex scanners */
 
@@ -1893,7 +1893,7 @@
 			outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
 			outn ("\t\t{ \\");
 			outn ("\t\tint c = '*'; \\");
-			outn ("\t\tint n; \\");
+			outn ("\t\tsize_t n; \\");
 			outn ("\t\tfor ( n = 0; n < max_size && \\");
 			outn ("\t\t\t     (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
 			outn ("\t\t\tbuf[n] = (char) c; \\");

Reply via email to