* grub-core/script/lexer.c (grub_script_lexer_init): Rename getline

	argument to prevent name collision.

diff --git a/ChangeLog b/ChangeLog
index d02749b4d49c11ecda0e95ee5ff7126a5471f6c5..76a9f68e00b815d37f8de862a3875f0510a89168 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/script/lexer.c (grub_script_lexer_init): Rename getline
+       argument to prevent name collision.
+
 2013-01-15  Colin Watson  <cjwatson@ubuntu.com>
 
        Remove nested functions from script reading and parsing.

diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
index cb9d6b0b7602e3d4d09b0db487a1b7a13d181b56..128d23822683f6ba95e0cb06d31a7234023fd216 100644 (file)
--- a/grub-core/script/lexer.c
+++ b/grub-core/script/lexer.c
@@ -216,7 +216,7 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
 
 struct grub_lexer_param *
 grub_script_lexer_init (struct grub_parser_param *parser, char *script,
-                       grub_reader_getline_t getline, void *getline_data)
+                       grub_reader_getline_t arg_getline, void *getline_data)
 {
   struct grub_lexer_param *lexerstate;
 
@@ -232,7 +232,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
       return 0;
     }
 
-  lexerstate->getline = getline;
+  lexerstate->getline = arg_getline;
   lexerstate->getline_data = getline_data;
   /* The other elements of lexerstate are all zeros already.  */