From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 14 Oct 2013 00:06:43 +0000 (+0200)
Subject: 	* grub-core/Makefile.core.def: Add osdep/init.c on emu.
X-Git-Tag: grub-2.02-beta1~714
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21d85db12f6fd2d60ccfde0e462746db73441787;p=thirdparty%2Fgrub.git

	* 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.
---

diff --git a/ChangeLog b/ChangeLog
index 2a51cd796..a67a71e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index d00a21ba8..2d3ced74f 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -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;
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 49e17f15d..08526129a 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -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>
diff --git a/grub-core/osdep/basic/init.c b/grub-core/osdep/basic/init.c
index d01725fc5..f4a673b64 100644
--- a/grub-core/osdep/basic/init.c
+++ b/grub-core/osdep/basic/init.c
@@ -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
 }
diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
index e6ad301b8..45554f1b2 100644
--- a/grub-core/osdep/windows/init.c
+++ b/grub-core/osdep/windows/init.c
@@ -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
 }