From 5177391ebe67f93edd065c7e6856763fad8f0dca Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 28 Oct 2013 13:33:12 +0100 Subject: [PATCH] * include/grub/emu/hostdisk.h: Add proper declaration for grub_host_init and grub_hostfs_init. --- ChangeLog | 5 +++++ grub-core/disk/host.c | 4 ++++ grub-core/kern/emu/main.c | 5 ----- include/grub/emu/hostdisk.h | 5 +++++ util/render-label.c | 4 +--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdd2c80c1..58e5e91f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-28 Vladimir Serbinenko + + * include/grub/emu/hostdisk.h: Add proper declaration for grub_host_init + and grub_hostfs_init. + 2013-10-28 Vladimir Serbinenko * grub-core/kern/emu/hostdisk.c (grub_util_check_file_presence): Use diff --git a/grub-core/disk/host.c b/grub-core/disk/host.c index 959211bb9..69b6f0ea1 100644 --- a/grub-core/disk/host.c +++ b/grub-core/disk/host.c @@ -20,9 +20,13 @@ /* When using the disk, make a reference to this module. Otherwise the user will end up with a useless module :-). */ +#include +#include + #include #include #include +#include int grub_disk_host_i_want_a_reference; diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c index 51ede76c0..87ae256f9 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -164,11 +164,6 @@ static struct argp argp = { -void grub_hostfs_init (void); -void grub_hostfs_fini (void); -void grub_host_init (void); -void grub_host_fini (void); - int main (int argc, char *argv[]) { diff --git a/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h index a150467d5..ba0034d5f 100644 --- a/include/grub/emu/hostdisk.h +++ b/include/grub/emu/hostdisk.h @@ -84,4 +84,9 @@ struct grub_util_hostdisk_data int device_map; }; +void grub_host_init (void); +void grub_host_fini (void); +void grub_hostfs_init (void); +void grub_hostfs_fini (void); + #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */ diff --git a/util/render-label.c b/util/render-label.c index 316da2c82..6bef638da 100644 --- a/util/render-label.c +++ b/util/render-label.c @@ -25,6 +25,7 @@ #include #include #include +#include #define _GNU_SOURCE 1 @@ -35,9 +36,6 @@ #include #include -void grub_hostfs_init (void); -void grub_host_init (void); - struct header { grub_uint8_t magic;