Add missing #ifndef YY_NO_INPUT around the input() function when

"%option noinput" is specified.  OK deraadt@

diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index cd935b1..c9843ba 100644 (file)
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -1,9 +1,9 @@
-/*     $OpenBSD: flex.skl,v 1.10 2007/01/26 14:38:19 tsi Exp $ */
+/*     $OpenBSD: flex.skl,v 1.11 2010/08/04 18:24:50 millert Exp $     */
 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/cvs/src/usr.bin/lex/flex.skl,v 1.10 2007/01/26 14:38:19 tsi Exp $
+ * $Header: /home/cvs/src/usr.bin/lex/flex.skl,v 1.11 2010/08/04 18:24:50 millert Exp $
  */
 
 #define FLEX_SCANNER
@@ -975,6 +975,7 @@ void yyFlexLexer::yyunput( int c, register char* yy_bp )
 
 
 %-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1050,6 +1051,9 @@ int yyFlexLexer::yyinput()
 
        return c;
        }
+%-
+#endif /* ifndef YY_NO_INPUT */
+%*
 
 
 %-