From df06824ea2921dda417f2b39c17f60377aecd7ce Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Tue, 1 Nov 2016 17:44:27 -0600
Subject: Fixed build against newer bison/flex.

Also added a gitignore.
---
 .gitignore        | 10 ++++++++++
 src/ast.cpp       |  2 +-
 src/buildparser.h |  3 ++-
 src/location.cpp  |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e6ca0af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+.*.swp
+*.o
+/build
+/.build_cache
+/build~
+src/build.tab.h
+src/build.tab.c
+src/build.yy.h
+src/build.yy.c
+/minibu
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 @@
 #include "astleaf.h"
 #include "astbranch.h"
 
-#include "build.tab.h"
+#include "buildparser.h"
 
 Ast::Ast()
 {
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 @@
 #ifndef BUILD_PARSER_H
 #define BUILD_PARSER_H
 
+typedef void * yyscan_t;
+class BuildParser;
 #include "build.tab.h"
 
 #include "bu/stack.h"
@@ -41,7 +43,6 @@ private:
     Bu::Hash<Bu::String, bool> hConds;
 };
 
-typedef void * yyscan_t;
 #define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b )
 YY_DECL;
 
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 @@
  */
 
 #include "location.h"
-#include "build.tab.h"
+#include "buildparser.h"
 
 Location::Location() :
     sFile("none"),
-- 
cgit v1.2.3