mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix building against Bison 2.6

Browse source
This commit is contained in:
Eelco Dolstra 2013-03-14 18:31:08 +01:00
parent c56bc3d81c
commit 804709706c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libexpr/lexer.l
View file

@ -9,7 +9,6 @@
%{ %{
#include "nixexpr.hh" #include "nixexpr.hh"
#define BISON_HEADER_HACK
#include "parser-tab.hh" #include "parser-tab.hh"
using namespace nix; using namespace nix;

9
src/libexpr/parser.y
View file

@ -4,10 +4,10 @@
%error-verbose %error-verbose
%defines %defines
/* %no-lines */ /* %no-lines */
%parse-param { yyscan_t scanner } %parse-param { void * scanner }
%parse-param { ParseData * data } %parse-param { nix::ParseData * data }
%lex-param { yyscan_t scanner } %lex-param { void * scanner }
%lex-param { ParseData * data } %lex-param { nix::ParseData * data }
%expect 1 %expect 1
%expect-rr 1 %expect-rr 1
@ -52,7 +52,6 @@ namespace nix {
#include "parser-tab.hh" #include "parser-tab.hh"
#include "lexer-tab.hh" #include "lexer-tab.hh"
#define YYSTYPE YYSTYPE // workaround a bug in Bison 2.4
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>