diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-14 18:31:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-14 18:31:08 +0100 |
| commit | 804709706c56c207f1eb9033f98b213216672269 (patch) | |
| tree | bc15a8bb69502b43a074490b3fbd4592c6993c31 /src/libexpr/parser.y | |
| parent | c56bc3d81cdcc09daf331b253a42cd155a9bd5f2 (diff) | |
Fix building against Bison 2.6
Diffstat (limited to 'src/libexpr/parser.y')
| -rw-r--r-- | src/libexpr/parser.y | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 66edfb548..f78780b1d 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -4,10 +4,10 @@ %error-verbose %defines /* %no-lines */ -%parse-param { yyscan_t scanner } -%parse-param { ParseData * data } -%lex-param { yyscan_t scanner } -%lex-param { ParseData * data } +%parse-param { void * scanner } +%parse-param { nix::ParseData * data } +%lex-param { void * scanner } +%lex-param { nix::ParseData * data } %expect 1 %expect-rr 1 @@ -52,7 +52,6 @@ namespace nix { #include "parser-tab.hh" #include "lexer-tab.hh" -#define YYSTYPE YYSTYPE // workaround a bug in Bison 2.4 #include <stdio.h> #include <stdlib.h> |