=== modified file 'ChangeLog'
--- ChangeLog	2010-09-23 00:10:44 +0000
+++ ChangeLog	2010-09-23 11:18:51 +0000
@@ -1,3 +1,10 @@
+2010-09-23  Grégoire Sutre  <address@hidden>
+
+	* include/grub/script_sh.h (grub_lexer_param): Renamed field `getline'
+	into `getnewline'.
+	* grub-core/script/lexer.c (grub_script_lexer_yywrap): Likewise.
+	(grub_script_lexer_init): Likewise.
+
 2010-09-23  Vladimir Serbinenko  <address@hidden>
 
 	Support xz compression on yeeloong.

=== modified file 'grub-core/script/lexer.c'
--- grub-core/script/lexer.c	2010-09-04 05:26:23 +0000
+++ grub-core/script/lexer.c	2010-09-23 07:32:35 +0000
@@ -133,7 +133,7 @@ grub_script_lexer_yywrap (struct grub_pa
   if (! lexerstate->refs && ! lexerstate->prefix && ! input)
     return 1;
 
-  if (! lexerstate->getline && ! input)
+  if (! lexerstate->getnewline && ! input)
     {
       grub_script_yyerror (parserstate, "unexpected end of file");
       return 1;
@@ -141,7 +141,7 @@ grub_script_lexer_yywrap (struct grub_pa
 
   line = 0;
   if (! input)
-    lexerstate->getline (&line, 1);
+    lexerstate->getnewline (&line, 1);
   else
     line = grub_strdup (input);
 
@@ -219,7 +219,7 @@ grub_script_lexer_init (struct grub_pars
       return 0;
     }
 
-  lexerstate->getline = getline;	/* rest are all zeros already */
+  lexerstate->getnewline = getline;	/* rest are all zeros already */
   if (yylex_init (&lexerstate->yyscanner))
     {
       grub_free (lexerstate->text);

=== modified file 'include/grub/script_sh.h'
--- include/grub/script_sh.h	2010-09-04 17:04:32 +0000
+++ include/grub/script_sh.h	2010-09-23 07:33:42 +0000
@@ -160,7 +160,7 @@ struct grub_lexer_param
 {
   /* Function used by the lexer to get a new line when more input is
      expected, but not available.  */
-  grub_reader_getline_t getline;
+  grub_reader_getline_t getnewline;
 
   /* A reference counter.  If this is >0 it means that the parser
      expects more tokens and `getline' should be called to fetch more.