From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 10 Oct 2013 07:18:06 +0000 (+0200)
Subject: 	Avoid including hostfile.h when not necessarry as it pulls
X-Git-Tag: grub-2.02-beta1~736
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71c1d67a347d6221955eeb99c2e75df3be7d98fd;p=thirdparty%2Fgrub.git

	Avoid including hostfile.h when not necessarry as it pulls
	in OS-specific headers which may redefine generic names
	like "far".
---

diff --git a/ChangeLog b/ChangeLog
index 5bc393d17..001c65a9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Avoid including hostfile.h when not necessarry as it pulls
+	in OS-specific headers which may redefine generic names
+	like "far".
+
 2013-10-09  Vladimir Testov  <vladimir.testov@rosalab.ru>
 
 	* grub-core/gfxmenu/gui_list.c: New options for scrollbar padding:
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 9a06addd5..48cc71c77 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -24,7 +24,6 @@
 
 #include <grub/symbol.h>
 #include <grub/types.h>
-#include <grub/osdep/hostfile.h>
 
 extern int verbosity;
 extern const char *program_name;
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 3c481c500..232b92029 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -29,7 +29,6 @@
 #include <grub/types.h>
 #include <grub/symbol.h>
 #include <grub/emu/misc.h>
-#include <grub/osdep/hostfile.h>
 
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_image_size (const char *path);
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 591604b4e..55206bcc6 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -23,6 +23,7 @@
 #include <grub/util/misc.h>
 #include <grub/lib/envblk.h>
 #include <grub/i18n.h>
+#include <grub/osdep/hostfile.h>
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 4ab91d8a0..5c13a58fc 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -34,6 +34,7 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 #include <grub/zfs/zfs.h>
+#include <grub/osdep/hostfile.h>
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 755231d25..2999ff2ed 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -43,6 +43,7 @@
 #include <grub/uboot/image.h>
 #include <grub/arm/reloc.h>
 #include <grub/ia64/reloc.h>
+#include <grub/osdep/hostfile.h>
 
 #define _GNU_SOURCE	1
 #include <argp.h>
diff --git a/util/misc.c b/util/misc.c
index 0893e7d68..af8ad5084 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -42,6 +42,7 @@
 #include <grub/time.h>
 #include <grub/i18n.h>
 #include <grub/script_sh.h>
+#include <grub/osdep/hostfile.h>
 
 #define ENABLE_RELOCATABLE 0
 #ifdef GRUB_BUILD