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

2
util/render-label.c
View file

@ -157,7 +157,7 @@ grub_util_render_label (const char *label_font,
ieee1275_palette[cptr].a = 0xff;
char * t;
t = canonicalize_file_name (label_font);
t = grub_canonicalize_file_name (label_font);
if (!t)
{
grub_util_error (_("cannot open `%s': %s"), label_font,