OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Oct-2004 20:24:20
Branch: HEAD Handle: 2004103119242000
Modified files:
openpkg-src/flex flex.patch
Log:
the correct thing is to adjust the number of arguments to the yywrap
define according to the number of actually passed ones
Summary:
Revision Changes Path
1.15 +10 -10 openpkg-src/flex/flex.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 flex.patch
--- openpkg-src/flex/flex.patch 31 Oct 2004 18:46:28 -0000 1.14
+++ openpkg-src/flex/flex.patch 31 Oct 2004 19:24:20 -0000 1.15
@@ -1,6 +1,6 @@
Index: doc/flex.texi
--- doc/flex.texi.orig 2003-03-27 19:02:59 +0100
-+++ doc/flex.texi 2004-10-31 19:42:39 +0100
++++ doc/flex.texi 2004-10-31 20:15:39 +0100
@@ -3804,6 +3804,7 @@
@example
@verbatim
@@ -67,7 +67,7 @@
Index: filter.c
--- filter.c.orig 2003-03-25 17:39:08 +0100
-+++ filter.c 2004-10-31 19:42:39 +0100
++++ filter.c 2004-10-31 20:15:39 +0100
@@ -158,10 +158,21 @@
int r;
@@ -105,7 +105,7 @@
}
Index: flex.skl
--- flex.skl.orig 2003-04-01 03:51:38 +0200
-+++ flex.skl 2004-10-31 19:43:36 +0100
++++ flex.skl 2004-10-31 20:15:39 +0100
@@ -345,19 +345,19 @@
%# yyscan_t yyscanner;
%#
@@ -219,7 +219,7 @@
#ifdef YY_DECL_IS_OURS
Index: gen.c
--- gen.c.orig 2003-03-30 21:58:44 +0200
-+++ gen.c 2004-10-31 19:42:39 +0100
++++ gen.c 2004-10-31 20:15:39 +0100
@@ -1812,7 +1812,6 @@
if (yytext_is_array) {
if (!reentrant){
@@ -230,7 +230,7 @@
}
Index: main.c
--- main.c.orig 2003-04-01 03:51:38 +0200
-+++ main.c 2004-10-31 19:42:39 +0100
++++ main.c 2004-10-31 20:20:01 +0100
@@ -199,6 +199,7 @@
{
#if ENABLE_NLS
@@ -352,7 +352,7 @@
if (!do_yywrap) {
- outn ("\n#define yywrap(n) 1");
-+ outn ("\n#define yywrap() 1");
++ outn ("\n#define yywrap(M4_YY_CALL_ONLY_ARG) 1");
outn ("#define YY_SKIP_YYWRAP");
}
@@ -366,7 +366,7 @@
else {
Index: scan.c
--- scan.c.orig 2003-04-01 18:33:17 +0200
-+++ scan.c 2004-10-31 19:43:56 +0100
++++ scan.c 2004-10-31 20:15:40 +0100
@@ -1,5 +1,6 @@
+#line 2 "scan.c"
@@ -431,7 +431,7 @@
#ifdef YY_DECL_IS_OURS
Index: scan.l
--- scan.l.orig 2003-04-01 03:51:38 +0200
-+++ scan.l 2004-10-31 19:42:39 +0100
++++ scan.l 2004-10-31 20:15:39 +0100
@@ -350,7 +350,7 @@
stack ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
stdinit do_stdinit = option_sense;
@@ -443,7 +443,7 @@
warn nowarn = ! option_sense;
Index: skel.c
--- skel.c.orig 2003-04-01 18:33:08 +0200
-+++ skel.c 2004-10-31 19:42:39 +0100
++++ skel.c 2004-10-31 20:15:39 +0100
@@ -404,19 +404,19 @@
"%# yyscan_t yyscanner;",
"%#",
@@ -549,7 +549,7 @@
"]])",
Index: tables.c
--- tables.c.orig 2002-11-27 15:43:24 +0100
-+++ tables.c 2004-10-31 19:42:39 +0100
++++ tables.c 2004-10-31 20:15:39 +0100
@@ -86,7 +86,7 @@
th->th_magic = YYTBL_MAGIC;
th->th_hsize = 14 + strlen (version_str) + 1 + strlen (name) + 1;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
