diff options
| author | Vincent Sanders <vincent.sanders@collabora.co.uk> | 2013-05-03 11:39:49 +0100 |
|---|---|---|
| committer | Vincent Sanders <vincent.sanders@collabora.co.uk> | 2013-05-03 11:39:49 +0100 |
| commit | 51bd18034c510a6d4711823e08b69af2f7aa063e (patch) | |
| tree | 3b64ae4cc401ec6dba896253965fff7bde0493b3 | |
| parent | 4fae88dac6f26991335a66948ad29f480f7f148f (diff) | |
| download | nsgenbind-51bd18034c510a6d4711823e08b69af2f7aa063e.tar.gz nsgenbind-51bd18034c510a6d4711823e08b69af2f7aa063e.tar.bz2 | |
fix building teh lexers with bison versions at and after 2.6
| -rw-r--r-- | src/nsgenbind-lexer.l | 10 | ||||
| -rw-r--r-- | src/webidl-lexer.l | 9 |
2 files changed, 19 insertions, 0 deletions
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 + %} |