From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 7 Aug 2012 17:39:47 +0000 (-0400)
Subject: Revert "Cleanup: YYPARSE_PARAM and YYLEX_PARAM are deprecated in bison 2.6"
X-Git-Tag: v1.0.0-rc5~34
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=9117bff7bdb6fbef175f136d1c5a83c97e33eda2

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

This reverts commit 51f4bb7a60d9f073553691dd0f4a52a88592c727.

Still needed for bison 2.5.

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

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index ef863a0f..8d2e5d77 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -22,6 +22,13 @@
 #include <glib.h>
 #include <babeltrace/list.h>
 
+// the parameter name (of the reentrant 'yyparse' function)
+// data is a pointer to a 'SParserParam' structure
+//#define YYPARSE_PARAM	scanner
+
+// the argument for the 'yylex' function
+#define YYLEX_PARAM	((struct ctf_scanner *) scanner)->scanner
+
 struct ctf_node;
 struct ctf_parser;