Module Name: src
Committed By: christos
Date: Thu Oct 30 18:44:05 UTC 2014
Modified Files:
src/external/bsd/flex/dist: buf.c ccl.c dfa.c ecs.c filter.c flexdef.h
gen.c initparse.c libmain.c libyywrap.c main.c misc.c nfa.c
options.c parse.y regex.c scan.l scanflags.c scanopt.c sym.c
tables.c tblcmp.c yylex.c
Log Message:
handle RCSID not being defined
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/buf.c \
src/external/bsd/flex/dist/libmain.c \
src/external/bsd/flex/dist/libyywrap.c src/external/bsd/flex/dist/yylex.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/ccl.c \
src/external/bsd/flex/dist/dfa.c src/external/bsd/flex/dist/ecs.c \
src/external/bsd/flex/dist/nfa.c src/external/bsd/flex/dist/options.c \
src/external/bsd/flex/dist/regex.c src/external/bsd/flex/dist/scanflags.c \
src/external/bsd/flex/dist/sym.c src/external/bsd/flex/dist/tblcmp.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/filter.c \
src/external/bsd/flex/dist/initparse.c src/external/bsd/flex/dist/misc.c \
src/external/bsd/flex/dist/parse.y src/external/bsd/flex/dist/tables.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/flexdef.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/flex/dist/gen.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/main.c \
src/external/bsd/flex/dist/scan.l src/external/bsd/flex/dist/scanopt.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/buf.c
diff -u src/external/bsd/flex/dist/buf.c:1.3 src/external/bsd/flex/dist/buf.c:1.4
--- src/external/bsd/flex/dist/buf.c:1.3 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/buf.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: buf.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: buf.c,v 1.4 2014/10/30 18:44:05 christos Exp $");
+
/* Take note: The buffer object is sometimes used as a String buffer (one
* continuous string), and sometimes used as a list of strings, usually line by
Index: src/external/bsd/flex/dist/libmain.c
diff -u src/external/bsd/flex/dist/libmain.c:1.3 src/external/bsd/flex/dist/libmain.c:1.4
--- src/external/bsd/flex/dist/libmain.c:1.3 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/libmain.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: libmain.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: libmain.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */
/* libmain - flex run-time support library "main" function */
@@ -22,8 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: libmain.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: libmain.c,v 1.4 2014/10/30 18:44:05 christos Exp $");
extern int yylex(void);
Index: src/external/bsd/flex/dist/libyywrap.c
diff -u src/external/bsd/flex/dist/libyywrap.c:1.3 src/external/bsd/flex/dist/libyywrap.c:1.4
--- src/external/bsd/flex/dist/libyywrap.c:1.3 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/libyywrap.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: libyywrap.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: libyywrap.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */
/* libyywrap - flex run-time support library "yywrap" function */
@@ -22,8 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: libyywrap.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: libyywrap.c,v 1.4 2014/10/30 18:44:05 christos Exp $");
int yywrap(void);
int
Index: src/external/bsd/flex/dist/yylex.c
diff -u src/external/bsd/flex/dist/yylex.c:1.3 src/external/bsd/flex/dist/yylex.c:1.4
--- src/external/bsd/flex/dist/yylex.c:1.3 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/yylex.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: yylex.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: yylex.c,v 1.4 2014/10/30 18:44:05 christos Exp $ */
/* yylex - scanner front-end for flex */
@@ -32,11 +32,10 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: yylex.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: yylex.c,v 1.4 2014/10/30 18:44:05 christos Exp $");
#include <ctype.h>
-#include "flexdef.h"
#include "parse.h"
Index: src/external/bsd/flex/dist/ccl.c
diff -u src/external/bsd/flex/dist/ccl.c:1.2 src/external/bsd/flex/dist/ccl.c:1.3
--- src/external/bsd/flex/dist/ccl.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/ccl.c Thu Oct 30 14:44:05 2014
@@ -30,10 +30,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: ccl.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: ccl.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
+
/* return true if the chr is in the ccl. Takes negation into account. */
static bool
Index: src/external/bsd/flex/dist/dfa.c
diff -u src/external/bsd/flex/dist/dfa.c:1.2 src/external/bsd/flex/dist/dfa.c:1.3
--- src/external/bsd/flex/dist/dfa.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/dfa.c Thu Oct 30 14:44:05 2014
@@ -28,10 +28,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: dfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: dfa.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
+
#include "tables.h"
/* declare functions that have forward references */
Index: src/external/bsd/flex/dist/ecs.c
diff -u src/external/bsd/flex/dist/ecs.c:1.2 src/external/bsd/flex/dist/ecs.c:1.3
--- src/external/bsd/flex/dist/ecs.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/ecs.c Thu Oct 30 14:44:05 2014
@@ -30,11 +30,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: ecs.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
-
#include "flexdef.h"
+__RCSID("$NetBSD: ecs.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
/* ccl2ecl - convert character classes to set of equivalence classes */
Index: src/external/bsd/flex/dist/nfa.c
diff -u src/external/bsd/flex/dist/nfa.c:1.2 src/external/bsd/flex/dist/nfa.c:1.3
--- src/external/bsd/flex/dist/nfa.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/nfa.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: nfa.c,v 1.3 2014/10/30 18:44:05 christos Exp $ */
/* nfa - NFA construction routines */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: nfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: nfa.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
+
/* declare functions that have forward references */
Index: src/external/bsd/flex/dist/options.c
diff -u src/external/bsd/flex/dist/options.c:1.2 src/external/bsd/flex/dist/options.c:1.3
--- src/external/bsd/flex/dist/options.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/options.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: options.c,v 1.3 2014/10/30 18:44:05 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,8 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: options.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: options.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
#include "options.h"
Index: src/external/bsd/flex/dist/regex.c
diff -u src/external/bsd/flex/dist/regex.c:1.2 src/external/bsd/flex/dist/regex.c:1.3
--- src/external/bsd/flex/dist/regex.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/regex.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: regex.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: regex.c,v 1.3 2014/10/30 18:44:05 christos Exp $ */
/** regex - regular expression functions related to POSIX regex lib. */
@@ -22,11 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: regex.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
-
+__RCSID("$NetBSD: regex.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
static const char* REGEXP_LINEDIR = "^#line ([[:digit:]]+) \"(.*)\"";
static const char* REGEXP_BLANK_LINE = "^[[:space:]]*$";
Index: src/external/bsd/flex/dist/scanflags.c
diff -u src/external/bsd/flex/dist/scanflags.c:1.2 src/external/bsd/flex/dist/scanflags.c:1.3
--- src/external/bsd/flex/dist/scanflags.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/scanflags.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scanflags.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: scanflags.c,v 1.3 2014/10/30 18:44:05 christos Exp $ */
/* scanflags - flags used by scanning. */
@@ -32,10 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: scanflags.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: scanflags.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
scanflags_t* _sf_stk = NULL;
size_t _sf_top_ix=0, _sf_max=0;
Index: src/external/bsd/flex/dist/sym.c
diff -u src/external/bsd/flex/dist/sym.c:1.2 src/external/bsd/flex/dist/sym.c:1.3
--- src/external/bsd/flex/dist/sym.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/sym.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sym.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: sym.c,v 1.3 2014/10/30 18:44:05 christos Exp $ */
/* sym - symbol table routines */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: sym.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: sym.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
+
/* Variables for symbol tables:
* sctbl - start-condition symbol table
Index: src/external/bsd/flex/dist/tblcmp.c
diff -u src/external/bsd/flex/dist/tblcmp.c:1.2 src/external/bsd/flex/dist/tblcmp.c:1.3
--- src/external/bsd/flex/dist/tblcmp.c:1.2 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/tblcmp.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tblcmp.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: tblcmp.c,v 1.3 2014/10/30 18:44:05 christos Exp $ */
/* tblcmp - table compression routines */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: tblcmp.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: tblcmp.c,v 1.3 2014/10/30 18:44:05 christos Exp $");
+
/* declarations for functions that have forward references */
Index: src/external/bsd/flex/dist/filter.c
diff -u src/external/bsd/flex/dist/filter.c:1.4 src/external/bsd/flex/dist/filter.c:1.5
--- src/external/bsd/flex/dist/filter.c:1.4 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/filter.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: filter.c,v 1.5 2014/10/30 18:44:05 christos Exp $ */
/* filter - postprocessing of flex output through filters */
@@ -22,10 +22,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: filter.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: filter.c,v 1.5 2014/10/30 18:44:05 christos Exp $");
+
static const char * check_4_gnu_m4 =
"m4_dnl ifdef(`__gnu__', ,"
"`errprint(Flex requires GNU M4. Set the PATH or set the M4 environment variable to its path name.)"
Index: src/external/bsd/flex/dist/initparse.c
diff -u src/external/bsd/flex/dist/initparse.c:1.4 src/external/bsd/flex/dist/initparse.c:1.5
--- src/external/bsd/flex/dist/initparse.c:1.4 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/initparse.c Thu Oct 30 14:44:05 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: initparse.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: initparse.c,v 1.5 2014/10/30 18:44:05 christos Exp $ */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: initparse.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: initparse.c,v 1.5 2014/10/30 18:44:05 christos Exp $");
#ifndef lint
static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
@@ -57,7 +57,6 @@ static const char yysccsid[] = "@(#)yacc
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include "flexdef.h"
#include "tables.h"
int pat, scnum, eps, headcnt, trailcnt, lastchar, i, rulelen;
Index: src/external/bsd/flex/dist/misc.c
diff -u src/external/bsd/flex/dist/misc.c:1.4 src/external/bsd/flex/dist/misc.c:1.5
--- src/external/bsd/flex/dist/misc.c:1.4 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/misc.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: misc.c,v 1.5 2014/10/30 18:44:05 christos Exp $ */
/* misc - miscellaneous flex routines */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: misc.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: misc.c,v 1.5 2014/10/30 18:44:05 christos Exp $");
+
#include "tables.h"
#include <stdarg.h>
Index: src/external/bsd/flex/dist/parse.y
diff -u src/external/bsd/flex/dist/parse.y:1.4 src/external/bsd/flex/dist/parse.y:1.5
--- src/external/bsd/flex/dist/parse.y:1.4 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/parse.y Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.4 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: parse.y,v 1.5 2014/10/30 18:44:05 christos Exp $ */
/* parse.y - parser for flex input */
@@ -64,10 +64,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: parse.y,v 1.4 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: parse.y,v 1.5 2014/10/30 18:44:05 christos Exp $");
+
#include "tables.h"
int pat, scnum, eps, headcnt, trailcnt, lastchar, i, rulelen;
Index: src/external/bsd/flex/dist/tables.c
diff -u src/external/bsd/flex/dist/tables.c:1.4 src/external/bsd/flex/dist/tables.c:1.5
--- src/external/bsd/flex/dist/tables.c:1.4 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/tables.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tables.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: tables.c,v 1.5 2014/10/30 18:44:05 christos Exp $ */
/* tables.c - tables serialization code
*
@@ -33,11 +33,10 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE.
*/
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: tables.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: tables.c,v 1.5 2014/10/30 18:44:05 christos Exp $");
-#include "flexdef.h"
#include "tables.h"
/** Convert size_t to t_flag.
Index: src/external/bsd/flex/dist/flexdef.h
diff -u src/external/bsd/flex/dist/flexdef.h:1.6 src/external/bsd/flex/dist/flexdef.h:1.7
--- src/external/bsd/flex/dist/flexdef.h:1.6 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/flexdef.h Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: flexdef.h,v 1.6 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: flexdef.h,v 1.7 2014/10/30 18:44:05 christos Exp $ */
/* flexdef - definitions file for flex */
@@ -41,6 +41,7 @@
#endif
/* AIX requires this to be the first thing in the file. */
+#ifndef __lint__
#ifndef __GNUC__
# if HAVE_ALLOCA_H
# include <alloca.h>
@@ -54,6 +55,7 @@ char *alloca ();
# endif
# endif
#endif
+#endif
#ifdef STDC_HEADERS
#include <stdio.h>
@@ -1227,4 +1229,8 @@ extern void sf_init(void);
extern void sf_push(void);
extern void sf_pop(void);
+#ifndef __RCSID
+#define __RCSID(a)
+#endif
+
#endif /* not defined FLEXDEF_H */
Index: src/external/bsd/flex/dist/gen.c
diff -u src/external/bsd/flex/dist/gen.c:1.10 src/external/bsd/flex/dist/gen.c:1.11
--- src/external/bsd/flex/dist/gen.c:1.10 Wed Oct 29 15:08:51 2014
+++ src/external/bsd/flex/dist/gen.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.10 2014/10/29 19:08:51 christos Exp $ */
+/* $NetBSD: gen.c,v 1.11 2014/10/30 18:44:05 christos Exp $ */
/* gen - actual generation (writing) of flex scanners */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: gen.c,v 1.10 2014/10/29 19:08:51 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: gen.c,v 1.11 2014/10/30 18:44:05 christos Exp $");
+
#include "tables.h"
Index: src/external/bsd/flex/dist/main.c
diff -u src/external/bsd/flex/dist/main.c:1.5 src/external/bsd/flex/dist/main.c:1.6
--- src/external/bsd/flex/dist/main.c:1.5 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/main.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: main.c,v 1.6 2014/10/30 18:44:05 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,11 +32,10 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.5 2014/10/29 18:28:36 christos Exp $");
+#include "flexdef.h"
+__RCSID("$NetBSD: main.c,v 1.6 2014/10/30 18:44:05 christos Exp $");
-#include "flexdef.h"
#include "version.h"
#include "options.h"
#include "tables.h"
Index: src/external/bsd/flex/dist/scan.l
diff -u src/external/bsd/flex/dist/scan.l:1.5 src/external/bsd/flex/dist/scan.l:1.6
--- src/external/bsd/flex/dist/scan.l:1.5 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/scan.l Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scan.l,v 1.5 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: scan.l,v 1.6 2014/10/30 18:44:05 christos Exp $ */
/* scan.l - scanner for flex input -*-C-*- */
@@ -33,10 +33,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: scan.l,v 1.5 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: scan.l,v 1.6 2014/10/30 18:44:05 christos Exp $");
+
#include "parse.h"
extern bool tablesverify, tablesext;
extern int trlcontxt; /* Set in parse.y for each rule. */
Index: src/external/bsd/flex/dist/scanopt.c
diff -u src/external/bsd/flex/dist/scanopt.c:1.5 src/external/bsd/flex/dist/scanopt.c:1.6
--- src/external/bsd/flex/dist/scanopt.c:1.5 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/dist/scanopt.c Thu Oct 30 14:44:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scanopt.c,v 1.5 2014/10/29 18:28:36 christos Exp $ */
+/* $NetBSD: scanopt.c,v 1.6 2014/10/30 18:44:05 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,10 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: scanopt.c,v 1.5 2014/10/29 18:28:36 christos Exp $");
-
#include "flexdef.h"
+__RCSID("$NetBSD: scanopt.c,v 1.6 2014/10/30 18:44:05 christos Exp $");
+
#include "scanopt.h"
