vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix canonicalize_file_name clash.

Browse source 
canonicalize_file_name clashed with gnulib function. Additionally
it was declared in 2 places: emu/misc.h and util/misc.h. Added
grub_ prefix and removed second declaration.
This commit is contained in:
Vladimir Serbinenko 2015-03-04 01:00:19 +01:00
parent 9d25b0da9a
commit 27d1a67f8a
20 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/grub-syslinux2cfg.c
View file

@ -175,7 +175,7 @@ main (int argc, char *argv[])
grub_host_init ();
char *t, *inpfull, *rootfull, *res;
t = canonicalize_file_name (arguments.input);
t = grub_canonicalize_file_name (arguments.input);
if (!t)
{
grub_util_error (_("cannot open `%s': %s"), arguments.input,
@ -185,7 +185,7 @@ main (int argc, char *argv[])
inpfull = xasprintf ("(host)/%s", t);
free (t);
t = canonicalize_file_name (arguments.root ? : "/");
t = grub_canonicalize_file_name (arguments.root ? : "/");
if (!t)
{
grub_util_error (_("cannot open `%s': %s"), arguments.root,
@ -206,7 +206,7 @@ main (int argc, char *argv[])
cwd = xstrdup (".");
}
t = canonicalize_file_name (arguments.cwd ? : cwd);
t = grub_canonicalize_file_name (arguments.cwd ? : cwd);
if (!t)
{
grub_util_error (_("cannot open `%s': %s"), arguments.root,