From 4d411d31deff5c4b2ad7d1689a9219c649843875 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 3 Dec 2013 15:14:53 +0800
Subject: discover/grub2: Fixes for bison 3.x

YYLEX_PARAM is removed in bison 3.0, so we need to pass the scanner
param directly through yyparse (rather than referencing
parser->scanner). Unfortunately, we don't have the lexer header
available at the time we declare yyparse, so we need to pass a void *
here.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 discover/grub2/grub2.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'discover/grub2/grub2.c')

diff --git a/discover/grub2/grub2.c b/discover/grub2/grub2.c
index 7f63c35..5b3009a 100644
--- a/discover/grub2/grub2.c
+++ b/discover/grub2/grub2.c
@@ -1,5 +1,6 @@
 
 #include <assert.h>
+#include <string.h>
 
 #include <talloc/talloc.h>
 #include <url/url.h>
@@ -9,8 +10,6 @@
 #include <discover/parser-utils.h>
 
 #include "grub2.h"
-#include "parser.h"
-#include "lexer.h"
 
 static const char *const grub2_conf_files[] = {
 	"/grub.cfg",
-- 
cgit v1.2.1