Revert "Cleanup: YYPARSE_PARAM and YYLEX_PARAM are deprecated in bison 2.6"

This reverts commit 9d3e6f62fde8c9ca7335ba12ee4560bc887b41a5.

Still needed for bison 2.5.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/lib/lttng-ctl/filter-ast.h b/src/lib/lttng-ctl/filter-ast.h
index d66fb8b58764a5bb638e4c3781106be75448236a..97793c00bf7f199fea49aa508282552b6ce4bf84 100644 (file)
--- a/src/lib/lttng-ctl/filter-ast.h
+++ b/src/lib/lttng-ctl/filter-ast.h
@@ -35,6 +35,13 @@
                        fprintf(stdout, "[debug] " fmt, ## args);       \
        } while (0)
 
+// the parameter name (of the reentrant 'yyparse' function)
+// data is a pointer to a 'SParserParam' structure
+//#define YYPARSE_PARAM        parser_ctx
+
+// the argument for the 'yylex' function
+#define YYLEX_PARAM    ((struct filter_parser_ctx *) parser_ctx)->scanner
+
 #ifndef YY_TYPEDEF_YY_SCANNER_T
 #define YY_TYPEDEF_YY_SCANNER_T
 typedef void* yyscan_t;