Module Name: src
Committed By: riz
Date: Thu Feb 23 02:11:51 UTC 2012
Modified Files:
src/external/bsd/flex/dist [netbsd-6]: libmain.c libyywrap.c
src/tools/compat [netbsd-6]: Makefile
Removed Files:
src/usr.bin/lex [netbsd-6]: COPYING FlexLexer.h Makefile NEWS VERSION
ccl.c config.h dfa.c ecs.c flex.1 flex.skl flexdef.h gen.c
initscan.c libmain.c libyywrap.c main.c misc.c mkskel.sh nfa.c
parse.y scan.l sym.c tblcmp.c version.h yylex.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #19):
usr.bin/lex/version.h: file removal
usr.bin/lex/main.c: file removal
usr.bin/lex/libmain.c: file removal
usr.bin/lex/COPYING: file removal
usr.bin/lex/misc.c: file removal
usr.bin/lex/Makefile: file removal
usr.bin/lex/dfa.c: file removal
tools/compat/Makefile: revision 1.56
external/bsd/flex/dist/libmain.c: revision 1.2
usr.bin/lex/flexdef.h: file removal
usr.bin/lex/flex.1: file removal
usr.bin/lex/ecs.c: file removal
usr.bin/lex/FlexLexer.h: file removal
usr.bin/lex/libyywrap.c: file removal
usr.bin/lex/config.h: file removal
usr.bin/lex/ccl.c: file removal
usr.bin/lex/NEWS: file removal
usr.bin/lex/flex.skl: file removal
usr.bin/lex/scan.l: file removal
usr.bin/lex/gen.c: file removal
usr.bin/lex/yylex.c: file removal
usr.bin/lex/VERSION: file removal
usr.bin/lex/initscan.c: file removal
usr.bin/lex/sym.c: file removal
usr.bin/lex/tblcmp.c: file removal
usr.bin/lex/nfa.c: file removal
usr.bin/lex/mkskel.sh: file removal
external/bsd/flex/dist/libyywrap.c: revision 1.2
usr.bin/lex/parse.y: file removal
this has not been used for ages.
Adjust libyywrap.c location.
fix prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 src/external/bsd/flex/dist/libmain.c \
src/external/bsd/flex/dist/libyywrap.c
cvs rdiff -u -r1.55 -r1.55.2.1 src/tools/compat/Makefile
cvs rdiff -u -r1.3 -r0 src/usr.bin/lex/COPYING src/usr.bin/lex/mkskel.sh
cvs rdiff -u -r1.9 -r0 src/usr.bin/lex/FlexLexer.h src/usr.bin/lex/ecs.c \
src/usr.bin/lex/tblcmp.c src/usr.bin/lex/version.h \
src/usr.bin/lex/yylex.c
cvs rdiff -u -r1.29 -r0 src/usr.bin/lex/Makefile
cvs rdiff -u -r1.4 -r0 src/usr.bin/lex/NEWS src/usr.bin/lex/config.h
cvs rdiff -u -r1.8 -r0 src/usr.bin/lex/VERSION src/usr.bin/lex/ccl.c
cvs rdiff -u -r1.12 -r0 src/usr.bin/lex/dfa.c
cvs rdiff -u -r1.16 -r0 src/usr.bin/lex/flex.1
cvs rdiff -u -r1.25 -r0 src/usr.bin/lex/flex.skl
cvs rdiff -u -r1.15 -r0 src/usr.bin/lex/flexdef.h
cvs rdiff -u -r1.18 -r0 src/usr.bin/lex/gen.c src/usr.bin/lex/initscan.c
cvs rdiff -u -r1.6 -r0 src/usr.bin/lex/libmain.c
cvs rdiff -u -r1.7 -r0 src/usr.bin/lex/libyywrap.c
cvs rdiff -u -r1.17 -r0 src/usr.bin/lex/main.c
cvs rdiff -u -r1.13 -r0 src/usr.bin/lex/misc.c src/usr.bin/lex/scan.l
cvs rdiff -u -r1.11 -r0 src/usr.bin/lex/nfa.c src/usr.bin/lex/parse.y \
src/usr.bin/lex/sym.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/libmain.c
diff -u src/external/bsd/flex/dist/libmain.c:1.1.1.1 src/external/bsd/flex/dist/libmain.c:1.1.1.1.8.1
--- src/external/bsd/flex/dist/libmain.c:1.1.1.1 Mon Oct 26 00:26:24 2009
+++ src/external/bsd/flex/dist/libmain.c Thu Feb 23 02:11:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: libmain.c,v 1.1.1.1 2009/10/26 00:26:24 christos Exp $ */
+/* $NetBSD: libmain.c,v 1.1.1.1.8.1 2012/02/23 02:11:51 riz Exp $ */
/* libmain - flex run-time support library "main" function */
@@ -23,13 +23,13 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-extern int yylex ();
+extern int yylex(void);
-int main (argc, argv)
- int argc;
- char *argv[];
+int
+/*ARGSUSED*/
+main(int argc, char *argv[])
{
- while (yylex () != 0) ;
-
+ while (yylex() != 0)
+ continue;
return 0;
}
Index: src/external/bsd/flex/dist/libyywrap.c
diff -u src/external/bsd/flex/dist/libyywrap.c:1.1.1.1 src/external/bsd/flex/dist/libyywrap.c:1.1.1.1.8.1
--- src/external/bsd/flex/dist/libyywrap.c:1.1.1.1 Mon Oct 26 00:26:24 2009
+++ src/external/bsd/flex/dist/libyywrap.c Thu Feb 23 02:11:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: libyywrap.c,v 1.1.1.1 2009/10/26 00:26:24 christos Exp $ */
+/* $NetBSD: libyywrap.c,v 1.1.1.1.8.1 2012/02/23 02:11:51 riz Exp $ */
/* libyywrap - flex run-time support library "yywrap" function */
@@ -23,7 +23,9 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-int yywrap (void)
+int yywrap(void);
+int
+yywrap(void)
{
return 1;
}
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.55 src/tools/compat/Makefile:1.55.2.1
--- src/tools/compat/Makefile:1.55 Thu Nov 3 19:30:05 2011
+++ src/tools/compat/Makefile Thu Feb 23 02:11:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2011/11/03 19:30:05 joerg Exp $
+# $NetBSD: Makefile,v 1.55.2.1 2012/02/23 02:11:50 riz Exp $
HOSTLIB= nbcompat
@@ -49,7 +49,7 @@ CPPFLAGS+= -I. -I./include -I${.CURDIR}
${.CURDIR}/../../common/lib/libc/hash/sha2 \
${.CURDIR}/../../common/lib/libc/md \
${.CURDIR}/../../common/lib/libc/stdlib \
- ${.CURDIR}/../../usr.bin/lex
+ ${.CURDIR}/../../external/bsd/flex/dist
DPSRCS+= defs.mk
CLEANFILES+= config.log config.status configure.lineno *.stamp
