* grub-core/Makefile.core.def: Add osdep/init.c on emu.

* grub-core/kern/emu/main.c: Add missing include.
	* grub-core/osdep/basic/init.c (grub_util_host_init) [!GRUB_UTIL]:
	Don't call grub_util_init_nls.
	* grub-core/osdep/windows/init.c (grub_util_host_init) [!GRUB_UTIL]:
	Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-14 02:06:43 +02:00
parent 66a1b3eeb7
commit 21d85db12f
5 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,12 @@
2013-10-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.core.def: Add osdep/init.c on emu.
* grub-core/kern/emu/main.c: Add missing include.
* grub-core/osdep/basic/init.c (grub_util_host_init) [!GRUB_UTIL]:
Don't call grub_util_init_nls.
* grub-core/osdep/windows/init.c (grub_util_host_init) [!GRUB_UTIL]:
Likewise.
2013-10-13 Vladimir Serbinenko <phcoder@gmail.com>
* util/misc.c (grub_util_get_image_size): Use FILE functions rather than

View File

@ -254,6 +254,7 @@ kernel = {
emu = kern/emu/cache.c;
emu = term/emu/console.c;
emu = osdep/sleep.c;
emu = osdep/init.c;
videoinkernel = term/gfxterm.c;
videoinkernel = font/font.c;

View File

@ -43,6 +43,7 @@
#include <grub/env.h>
#include <grub/partition.h>
#include <grub/i18n.h>
#include <grub/util/misc.h>
#include "progname.h"
#include <argp.h>

View File

@ -29,5 +29,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
{
set_program_name ((*argv)[0]);
#ifdef GRUB_UTIL
grub_util_init_nls ();
#endif
}

View File

@ -139,5 +139,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
set_program_name ((*argv)[0]);
#ifdef GRUB_UTIL
grub_util_init_nls ();
#endif
}