merge with mainline
This commit is contained in:
commit
a762e3c335
13 changed files with 142 additions and 21 deletions
|
@ -138,6 +138,9 @@ typedef struct grub_disk_memberlist *grub_disk_memberlist_t;
|
|||
#define GRUB_DISK_CACHE_SIZE 8
|
||||
#define GRUB_DISK_CACHE_BITS 3
|
||||
|
||||
/* Return value of grub_disk_get_size() in case disk size is unknown. */
|
||||
#define GRUB_DISK_SIZE_UNKNOWN 0xffffffffffffffffULL
|
||||
|
||||
/* This is called from the memory manager. */
|
||||
void grub_disk_cache_invalidate_all (void);
|
||||
|
||||
|
|
|
@ -47,6 +47,6 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
|
|||
#endif
|
||||
|
||||
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
|
||||
char * canonicalize_file_name (const char *path);
|
||||
extern char * canonicalize_file_name (const char *path);
|
||||
|
||||
#endif /* GRUB_EMU_MISC_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue