From da267d8a5d01d2b3ad7f6eb4b1649756558bbda8 Mon Sep 17 00:00:00 2001 From: Will Estes Date: Tue, 20 May 2003 20:25:38 +0000 Subject: [PATCH] patches from manoj via sourceforge --- flex.skl | 22 ++++++++++++---------- gen.c | 1 - 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flex.skl b/flex.skl index 1e07795..7764f3e 100644 --- a/flex.skl +++ b/flex.skl @@ -345,19 +345,19 @@ m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]], %# yyscan_t yyscanner; %# %# Generate traditional function defs - m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) + m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]] M4_YY_DECL_LAST_ARG]]) - m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) - $1 $2; + m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]] + $1 $2; [[\]] M4_YY_DECL_LAST_ARG]]) - m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) - $1 $2; - $3 $4; + m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]] + $1 $2; [[\]] + $3 $4; [[\]] M4_YY_DECL_LAST_ARG]]) - m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) - $1 $2; - $3 $4; - $5 $6; + m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]] + $1 $2; [[\]] + $3 $4; [[\]] + $5 $6; [[\]] M4_YY_DECL_LAST_ARG]]) ]], [[ @@ -724,6 +724,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]], [[#endif]]) m4_ifdef( [[M4_YY_NO_UNISTD_H]],, [[ +#ifndef YY_NO_UNISTD_H /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. @@ -734,6 +735,7 @@ m4_ifdef( [[M4_YY_NO_UNISTD_H]],, %if-c++-only #include %endif +#endif ]]) #ifndef YY_EXTRA_TYPE diff --git a/gen.c b/gen.c index bb1100b..5f4b4aa 100644 --- a/gen.c +++ b/gen.c @@ -1812,7 +1812,6 @@ void make_tables () if (yytext_is_array) { if (!reentrant){ indent_puts ("static int yy_more_offset = 0;"); - }else{ indent_puts ("static int yy_prev_more_offset = 0;"); } } -- 2.40.0