Module Name:    src
Committed By:   drochner
Date:           Mon Apr 20 16:01:18 UTC 2009

Modified Files:
        src/usr.bin/lex: flex.skl

Log Message:
if YY_NO_INPUT is defined, disable not only the declaration but also
the definition of yyinput(), avoids compiler warnings with newer gcc.
from Kurt J. Lidl per PR misc/41160, with a minor change to make it
generate paired #directives in the "-+", ie c++, case


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/lex/flex.skl

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

Modified files:

Index: src/usr.bin/lex/flex.skl
diff -u src/usr.bin/lex/flex.skl:1.22 src/usr.bin/lex/flex.skl:1.23
--- src/usr.bin/lex/flex.skl:1.22	Mon Aug  8 01:28:08 2005
+++ src/usr.bin/lex/flex.skl	Mon Apr 20 16:01:17 2009
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $NetBSD: flex.skl,v 1.22 2005/08/08 01:28:08 christos Exp $
+ * $NetBSD: flex.skl,v 1.23 2009/04/20 16:01:17 drochner Exp $
  */
 
 #define FLEX_SCANNER
@@ -987,6 +987,7 @@
 
 
 %-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1062,6 +1063,9 @@
 
 	return c;
 	}
+%-
+#endif /* ifndef YY_NO_INPUT */
+%*
 
 
 %-

Reply via email to