diff options
author | Mike Buland <eichlan@xagasoft.com> | 2016-11-01 17:44:27 -0600 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2016-11-01 17:44:27 -0600 |
commit | df06824ea2921dda417f2b39c17f60377aecd7ce (patch) | |
tree | 414c0668046e12a30a140befaf2f1633ad22c68d /src | |
parent | 31fa2d4836ce93993aa94364b1c3dd2195c90142 (diff) | |
download | build-df06824ea2921dda417f2b39c17f60377aecd7ce.tar.gz build-df06824ea2921dda417f2b39c17f60377aecd7ce.tar.bz2 build-df06824ea2921dda417f2b39c17f60377aecd7ce.tar.xz build-df06824ea2921dda417f2b39c17f60377aecd7ce.zip |
Fixed build against newer bison/flex.
Also added a gitignore.
Diffstat (limited to 'src')
-rw-r--r-- | src/ast.cpp | 2 | ||||
-rw-r--r-- | src/buildparser.h | 3 | ||||
-rw-r--r-- | src/location.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ast.cpp b/src/ast.cpp index 24d3193..4bbe186 100644 --- a/src/ast.cpp +++ b/src/ast.cpp | |||
@@ -9,7 +9,7 @@ | |||
9 | #include "astleaf.h" | 9 | #include "astleaf.h" |
10 | #include "astbranch.h" | 10 | #include "astbranch.h" |
11 | 11 | ||
12 | #include "build.tab.h" | 12 | #include "buildparser.h" |
13 | 13 | ||
14 | Ast::Ast() | 14 | Ast::Ast() |
15 | { | 15 | { |
diff --git a/src/buildparser.h b/src/buildparser.h index 47597bb..5e92895 100644 --- a/src/buildparser.h +++ b/src/buildparser.h | |||
@@ -8,6 +8,8 @@ | |||
8 | #ifndef BUILD_PARSER_H | 8 | #ifndef BUILD_PARSER_H |
9 | #define BUILD_PARSER_H | 9 | #define BUILD_PARSER_H |
10 | 10 | ||
11 | typedef void * yyscan_t; | ||
12 | class BuildParser; | ||
11 | #include "build.tab.h" | 13 | #include "build.tab.h" |
12 | 14 | ||
13 | #include "bu/stack.h" | 15 | #include "bu/stack.h" |
@@ -41,7 +43,6 @@ private: | |||
41 | Bu::Hash<Bu::String, bool> hConds; | 43 | Bu::Hash<Bu::String, bool> hConds; |
42 | }; | 44 | }; |
43 | 45 | ||
44 | typedef void * yyscan_t; | ||
45 | #define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b ) | 46 | #define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b ) |
46 | YY_DECL; | 47 | YY_DECL; |
47 | 48 | ||
diff --git a/src/location.cpp b/src/location.cpp index 1e2dfcd..507c922 100644 --- a/src/location.cpp +++ b/src/location.cpp | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include "location.h" | 8 | #include "location.h" |
9 | #include "build.tab.h" | 9 | #include "buildparser.h" |
10 | 10 | ||
11 | Location::Location() : | 11 | Location::Location() : |
12 | sFile("none"), | 12 | sFile("none"), |