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

3
include/grub/emu/misc.h
View file

@ -27,6 +27,7 @@
#include <grub/symbol.h>
#include <grub/types.h>
#include <grub/misc.h>
#include <grub/util/misc.h>
extern int verbosity;
extern const char *program_name;
@ -61,8 +62,6 @@ void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format
grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void);
extern char * canonicalize_file_name (const char *path);
#ifdef HAVE_DEVICE_MAPPER
int grub_device_mapper_supported (void);
#endif

2
include/grub/util/misc.h
View file

@ -41,7 +41,7 @@ void grub_util_write_image_at (const void *img, size_t size, off_t offset,
char *make_system_path_relative_to_its_root (const char *path);
char *canonicalize_file_name (const char *path);
char *grub_canonicalize_file_name (const char *path);
void grub_util_init_nls (void);