From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 21 Jul 2010 23:33:49 +0000 (+0530)
Subject: pull-in nested-record branch
X-Git-Tag: 1.99~600^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0878653f65e0a271af1e40d636e7b33b35f0e5c0;p=thirdparty%2Fgrub.git

pull-in nested-record branch
---

0878653f65e0a271af1e40d636e7b33b35f0e5c0
diff --cc include/grub/script_sh.h
index 7618633ad,42fc2259a..ffedf5c75
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -360,8 -344,8 +360,9 @@@ grub_script_function_t grub_script_func
  						    struct grub_script *cmd);
  void grub_script_function_remove (const char *name);
  grub_script_function_t grub_script_function_find (char *functionname);
 -int grub_script_function_call (grub_script_function_t func,
 -			       int argc, char **args);
++
 +grub_err_t grub_script_function_call (grub_script_function_t func,
 +				      int argc, char **args);
  
  char **
  grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);