- fix for bison-2.7

diff --git a/bison.patch b/bison.patch
new file mode 100644 (file)
index 0000000..d91a5fd
--- /dev/null
+++ b/bison.patch
@@ -0,0 +1,47 @@
+commit 51bd18034c510a6d4711823e08b69af2f7aa063e
+Author: Vincent Sanders <vincent.sanders@collabora.co.uk>
+Date:   Fri May 3 11:39:49 2013 +0100
+
+    fix building teh lexers with bison versions at and after 2.6
+
+diff --git a/src/nsgenbind-lexer.l b/src/nsgenbind-lexer.l
+index b257c83..8189a72 100644
+--- a/src/nsgenbind-lexer.l
++++ b/src/nsgenbind-lexer.l
+@@ -19,6 +19,16 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
++
++/* Ensure compatability with bison 2.6 and later */
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED
++#define YYSTYPE NSGENBIND_STYPE
++#endif
++
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED
++#define YYLTYPE NSGENBIND_LTYPE
++#endif
++
+ %}
+ 
+ /* lexer options */
+diff --git a/src/webidl-lexer.l b/src/webidl-lexer.l
+index 5369d99..74b9bb8 100644
+--- a/src/webidl-lexer.l
++++ b/src/webidl-lexer.l
+@@ -27,6 +27,15 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
++/* Ensure compatability with bison 2.6 and later */
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED
++#define YYSTYPE WEBIDL_STYPE
++#endif
++
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED
++#define YYLTYPE WEBIDL_LTYPE
++#endif
++
+ %}
+ 
+