From: Nicholas Vinson <nvinson234@gmail.com>
To: skenton@ou.edu,
	grub-devel@gnu.org
Subject: [GRUB PARTUUID PATCH V3 1/5] Fix flex-2.6.3 incompatbility issue
Date: Sun, 26 Feb 2017 16:20:51 -0800
Message-Id: <20170227002055.5829-2-nvinson234@gmail.com>
In-Reply-To: <20170227002055.5829-1-nvinson234@gmail.com>
References: <20170227002055.5829-1-nvinson234@gmail.com>
Precedence: list

---
 grub-core/script/yylex.l | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
index 95b219170..3917904b4 100644
--- a/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@ -31,10 +31,6 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wsign-compare"
 
-#define yyalloc(size, scanner)   (grub_malloc((size)))
-#define yyfree(ptr, scanner)   (grub_free((ptr)))
-#define yyrealloc(ptr, size, scanner) (grub_realloc((ptr), (size)))
-
 /* 
  * As we don't have access to yyscanner, we cannot do much except to
  * print the fatal error.
@@ -327,6 +323,24 @@ POS_MULTILINE   {WORD}?\\\n
                 }
 %%
 
+void *
+yyalloc(yy_size_t size, yyscan_t yyscanner)
+{
+  return grub_malloc(size);
+}
+
+void
+yyfree(void *ptr, yyscan_t yyscanner)
+{
+  return grub_free(ptr);
+}
+
+void *
+yyrealloc(void *ptr, yy_size_t size, yyscan_t yyscanner)
+{
+  return grub_realloc(ptr, size);
+}
+
 int
 yywrap (yyscan_t yyscanner)
 {
-- 
2.12.0