Fix compilation of utilities
PATCH 1/1 Fix compilation of utilities
ChangeLog:
* util/misc.c: Move grub_reboot() and grub_halt() ...
* util/grub-emu.c: ... here. Make main_env static.
* include/grub/util/misc.h: Remove main_env.
---
include/grub/util/misc.h | 1 - util/grub-emu.c | 18 +++++++++++++++++- util/misc.c | 16 ---------------- 3 files changed, 17 insertions(+), 18 deletions(-)
include/grub/util/misc.h +0 -1
@@ -38,7 +38,6 @@extern char *progname;extern int verbosity; -extern jmp_buf main_env;void grub_util_warn (const char *fmt, ...);void grub_util_info (const char *fmt, ...);
util/grub-emu.c +17 -1
@@ -40,7 +40,7 @@#include <grub_emu_init.h> /* Used for going back to the main function. */ -jmp_buf main_env; +static jmp_buf main_env;/* Store the prefix specified by an argument. */ static char *prefix =0 ;
@@ -69,6 +69,22 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr) }void +grub_reboot (void ) +{ +longjmp (main_env,1 ); +} + +void +grub_halt ( +#ifdef GRUB_MACHINE_PCBIOS + int no_apm __attribute__ ((unused)) +#endif + ) +{ +grub_reboot (); +} + +void grub_machine_init (void ) { }
util/misc.c +0 -16
@@ -439,19 +439,3 @@ fail: }#endif /* __MINGW32__ */ - -void -grub_reboot (void ) -{ -longjmp (main_env,1 ); -} - -void -grub_halt ( -#ifdef GRUB_MACHINE_PCBIOS - int no_apm __attribute__ ((unused)) -#endif - ) -{ -grub_reboot (); -}