Module Name: src
Committed By: sborrill
Date: Tue Dec 22 15:34:40 UTC 2009
Modified Files:
src/usr.bin/lex [netbsd-5]: flex.skl initscan.c
Log Message:
Pull up the following revisions(s) (requested by hubertf in ticket #1197):
usr.bin/lex/flex.skl: revision 1.23-125
usr.bin/lex/initscan.c: revision 1.18
If YY_NO_INPUT is defined, disable not only the declaration but also
the definition of yyinput() to avoid compiler warnings with newer gcc.
Addresses PR#41160.
Introduce ANSI prototypes for yyinput.
Conditionalize the yyinput/input() function definition the same way
as it's always been done in the prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.28.1 src/usr.bin/lex/flex.skl
cvs rdiff -u -r1.17 -r1.17.40.1 src/usr.bin/lex/initscan.c
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.22.28.1
--- src/usr.bin/lex/flex.skl:1.22 Mon Aug 8 01:28:08 2005
+++ src/usr.bin/lex/flex.skl Tue Dec 22 15:34:40 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.22.28.1 2009/12/22 15:34:40 sborrill Exp $
*/
#define FLEX_SCANNER
@@ -987,13 +987,14 @@
%-
+#ifndef YY_NO_INPUT
#ifdef __cplusplus
-static int yyinput()
+static int yyinput YY_PROTO(( void ))
#else
-static int input()
+static int input YY_PROTO(( void ))
#endif
%+
-int yyFlexLexer::yyinput()
+int yyFlexLexer::yyinput(void)
%*
{
int c;
@@ -1062,6 +1063,9 @@
return c;
}
+%-
+#endif /* ifndef YY_NO_INPUT */
+%*
%-
Index: src/usr.bin/lex/initscan.c
diff -u src/usr.bin/lex/initscan.c:1.17 src/usr.bin/lex/initscan.c:1.17.40.1
--- src/usr.bin/lex/initscan.c:1.17 Tue Dec 2 06:22:14 2003
+++ src/usr.bin/lex/initscan.c Tue Dec 22 15:34:40 2009
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $NetBSD: initscan.c,v 1.17 2003/12/02 06:22:14 lukem Exp $
+ * $NetBSD: initscan.c,v 1.17.40.1 2009/12/22 15:34:40 sborrill Exp $
*/
#define FLEX_SCANNER
@@ -1274,7 +1274,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $NetBSD: initscan.c,v 1.17 2003/12/02 06:22:14 lukem Exp $ */
+/* $NetBSD: initscan.c,v 1.17.40.1 2009/12/22 15:34:40 sborrill Exp $ */
#include "flexdef.h"
#include "parse.h"
@@ -3141,9 +3141,9 @@
#ifdef __cplusplus
-static int yyinput()
+static int yyinput(void)
#else
-static int input()
+static int input(void)
#endif
{
int c;
