Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/flex/dist handle RCSID not being defined



details:   https://anonhg.NetBSD.org/src/rev/734fd69de085
branches:  trunk
changeset: 333368:734fd69de085
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Oct 30 18:44:05 2014 +0000

description:
handle RCSID not being defined

diffstat:

 external/bsd/flex/dist/buf.c       |  7 +++----
 external/bsd/flex/dist/ccl.c       |  5 ++---
 external/bsd/flex/dist/dfa.c       |  5 ++---
 external/bsd/flex/dist/ecs.c       |  5 +----
 external/bsd/flex/dist/filter.c    |  7 +++----
 external/bsd/flex/dist/flexdef.h   |  8 +++++++-
 external/bsd/flex/dist/gen.c       |  7 +++----
 external/bsd/flex/dist/initparse.c |  7 +++----
 external/bsd/flex/dist/libmain.c   |  6 +++---
 external/bsd/flex/dist/libyywrap.c |  6 +++---
 external/bsd/flex/dist/main.c      |  7 +++----
 external/bsd/flex/dist/misc.c      |  7 +++----
 external/bsd/flex/dist/nfa.c       |  7 +++----
 external/bsd/flex/dist/options.c   |  6 +++---
 external/bsd/flex/dist/parse.y     |  7 +++----
 external/bsd/flex/dist/regex.c     |  7 ++-----
 external/bsd/flex/dist/scan.l      |  7 +++----
 external/bsd/flex/dist/scanflags.c |  6 ++----
 external/bsd/flex/dist/scanopt.c   |  7 +++----
 external/bsd/flex/dist/sym.c       |  7 +++----
 external/bsd/flex/dist/tables.c    |  7 +++----
 external/bsd/flex/dist/tblcmp.c    |  7 +++----
 external/bsd/flex/dist/yylex.c     |  7 +++----
 23 files changed, 67 insertions(+), 85 deletions(-)

diffs (truncated from 496 to 300 lines):

diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/buf.c
--- a/external/bsd/flex/dist/buf.c      Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/buf.c      Thu Oct 30 18:44:05 2014 +0000
@@ -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 $");
 
-#include "flexdef.h"
 
 /* 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
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/ccl.c
--- a/external/bsd/flex/dist/ccl.c      Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/ccl.c      Thu Oct 30 18:44:05 2014 +0000
@@ -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 $");
 
-#include "flexdef.h"
 
 /* return true if the chr is in the ccl. Takes negation into account. */
 static bool
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/dfa.c
--- a/external/bsd/flex/dist/dfa.c      Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/dfa.c      Thu Oct 30 18:44:05 2014 +0000
@@ -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 "flexdef.h"
 #include "tables.h"
 
 /* declare functions that have forward references */
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/ecs.c
--- a/external/bsd/flex/dist/ecs.c      Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/ecs.c      Thu Oct 30 18:44:05 2014 +0000
@@ -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 */
 
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/filter.c
--- a/external/bsd/flex/dist/filter.c   Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/filter.c   Thu Oct 30 18:44:05 2014 +0000
@@ -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 $");
 
-#include "flexdef.h"
 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.)"
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/flexdef.h
--- a/external/bsd/flex/dist/flexdef.h  Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/flexdef.h  Thu Oct 30 18:44:05 2014 +0000
@@ -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 @@
 #  endif
 # endif
 #endif
+#endif
 
 #ifdef STDC_HEADERS
 #include <stdio.h>
@@ -1227,4 +1229,8 @@
 extern void sf_push(void);
 extern void sf_pop(void);
 
+#ifndef __RCSID
+#define __RCSID(a)
+#endif
+
 #endif /* not defined FLEXDEF_H */
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/gen.c
--- a/external/bsd/flex/dist/gen.c      Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/gen.c      Thu Oct 30 18:44:05 2014 +0000
@@ -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 "flexdef.h"
 #include "tables.h"
 
 
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/initparse.c
--- a/external/bsd/flex/dist/initparse.c        Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/initparse.c        Thu Oct 30 18:44:05 2014 +0000
@@ -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 @@
 /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
 /*  PURPOSE. */
 
-#include "flexdef.h"
 #include "tables.h"
 
 int pat, scnum, eps, headcnt, trailcnt, lastchar, i, rulelen;
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/libmain.c
--- a/external/bsd/flex/dist/libmain.c  Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/libmain.c  Thu Oct 30 18:44:05 2014 +0000
@@ -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);
 
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/libyywrap.c
--- a/external/bsd/flex/dist/libyywrap.c        Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/libyywrap.c        Thu Oct 30 18:44:05 2014 +0000
@@ -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
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/main.c
--- a/external/bsd/flex/dist/main.c     Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/main.c     Thu Oct 30 18:44:05 2014 +0000
@@ -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"
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/misc.c
--- a/external/bsd/flex/dist/misc.c     Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/misc.c     Thu Oct 30 18:44:05 2014 +0000
@@ -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 "flexdef.h"
 #include "tables.h"
 #include <stdarg.h>
 
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/nfa.c
--- a/external/bsd/flex/dist/nfa.c      Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/nfa.c      Thu Oct 30 18:44:05 2014 +0000
@@ -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 $");
 
-#include "flexdef.h"
 
 
 /* declare functions that have forward references */
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/options.c
--- a/external/bsd/flex/dist/options.c  Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/options.c  Thu Oct 30 18:44:05 2014 +0000
@@ -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"
 
diff -r 7a54a4f4ce60 -r 734fd69de085 external/bsd/flex/dist/parse.y
--- a/external/bsd/flex/dist/parse.y    Thu Oct 30 17:13:41 2014 +0000
+++ b/external/bsd/flex/dist/parse.y    Thu Oct 30 18:44:05 2014 +0000



Home | Main Index | Thread Index | Old Index