[Xen-changelog] [xen stable-4.4] libxl: Fix building libxlu_cfg_y.y with bison 3.0

[patchbot@xxxxxxx]

commit a43691789e8f3597709a731a535c8e07fe1837ed
Author:     Ed Swierk <eswierk@xxxxxxxxxxxxxxxxxx>
AuthorDate: Tue Jan 6 15:21:07 2015 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Jan 4 14:48:09 2016 +0000

    libxl: Fix building libxlu_cfg_y.y with bison 3.0
    
    - 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 <eswierk@xxxxxxxxxxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Tested-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    
    (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 <ian.jackson@xxxxxxxxxxxxx>
---
 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 <string>                IDENT STRING NUMBER NEWLINE
 %type <string>            atom
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.4

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog