[src/trunk]: src/external/bsd/flex/dist Fixes to pass -Wall

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf69a85ed0e6
branches:  trunk
changeset: 748561:bf69a85ed0e6
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Oct 27 01:44:01 2009 +0000

description:
Fixes to pass -Wall

diffstat:

 external/bsd/flex/dist/flex.skl |  6 +++++-
 external/bsd/flex/dist/gen.c    |  4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r b4786fb57b0e -r bf69a85ed0e6 external/bsd/flex/dist/flex.skl
--- a/external/bsd/flex/dist/flex.skl   Mon Oct 26 22:40:50 2009 +0000
+++ b/external/bsd/flex/dist/flex.skl   Tue Oct 27 01:44:01 2009 +0000
@@ -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
diff -r b4786fb57b0e -r bf69a85ed0e6 external/bsd/flex/dist/gen.c
--- a/external/bsd/flex/dist/gen.c      Mon Oct 26 22:40:50 2009 +0000
+++ b/external/bsd/flex/dist/gen.c      Tue Oct 27 01:44:01 2009 +0000
@@ -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; \\");