From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 4.4 2/2] libxl: Fix building libxlu_cfg_y.y with bison 3.0 Date: Mon, 4 Jan 2016 14:50:24 +0000 Message-ID: <1451919024-7904-2-git-send-email-ian.jackson@eu.citrix.com> References: <1451902108.13361.12.camel@citrix.com> <1451919024-7904-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1451919024-7904-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Ed Swierk , Ian Jackson , osstest-admin@xenproject.org, Jan Beulich List-Id: xen-devel@lists.xenproject.org From: Ed Swierk - Use %lex-param instead of obsolete YYLEX_PARAM to override lex scanner parameter - Change deprecated %name-prefix= to %name-prefix Tested against bison 2.4.1 and 3.0.2. This is expected to sometimes (depending on timestamps and whether the bison input files are edited) break building on systems with ancient versions of bison. Bison 2.4.1 is known to work and was released in December 2008. Also, consquentially, regenerate bison output files with bison 1:2.5.dfsg-2.1 from Debian wheezy. Signed-off-by: Ed Swierk Acked-by: Ian Jackson Tested-by: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk (cherry picked from commit 7ba4cdfadd4f3c45d65ffe50e621759f458fedc0) [ I have checked that rebuilding the bison and flex input produces no further changes. -iwj ] Signed-off-by: Ian Jackson --- tools/libxl/libxlu_cfg_y.c | 4 ++-- tools/libxl/libxlu_cfg_y.y | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c index 4437e05..07b5a1d 100644 --- a/tools/libxl/libxlu_cfg_y.c +++ b/tools/libxl/libxlu_cfg_y.c @@ -76,7 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "libxlu_cfg_y.y" -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" @@ -656,7 +656,7 @@ while (YYID (0)) #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc, scanner) +# define YYLEX yylex (&yylval, &yylloc, ctx_scanner) #endif /* Enable debugging if requested. */ diff --git a/tools/libxl/libxlu_cfg_y.y b/tools/libxl/libxlu_cfg_y.y index aa9f787..5acd438 100644 --- a/tools/libxl/libxlu_cfg_y.y +++ b/tools/libxl/libxlu_cfg_y.y @@ -17,7 +17,7 @@ */ %{ -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" %} @@ -31,9 +31,9 @@ %pure-parser %defines %error-verbose -%name-prefix="xlu__cfg_yy" +%name-prefix "xlu__cfg_yy" %parse-param { CfgParseContext *ctx } -%lex-param { void *scanner } +%lex-param { ctx_scanner } %token IDENT STRING NUMBER NEWLINE %type atom -- 1.7.10.4