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 5bc393d17adce5be390ba366e49bb727548f4c18..001c65a9ceb0a5aeea433abb25710c66509bff56 100644 (file)
--- 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 9a06addd59b539db272adf96f195a123b320997b..48cc71c77d0f8a4bf2aaaa85520e15d59fd0987c 100644 (file)
--- 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 3c481c5003dd5859ad277569624a84c5472a0cc3..232b920298bbfeedbc6cd8d0d6baacebf2ecf1bc 100644 (file)
--- 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 591604b4e60ac3260599c355531156e24fb0a8d3..55206bcc6931649022a1d53f62f6bd3784a713fa 100644 (file)
--- 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 4ab91d8a08717b3b8ec109f107138d1ba9837a4e..5c13a58fc9bea1eabe912c7abc98a68407d08c11 100644 (file)
--- 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 755231d2500205d32c4d774bbfaa73eec991091c..2999ff2ed4622b99ce10f1d0bb84cbb0b613829f 100644 (file)
--- 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 0893e7d681268056afba4d17b01aa82429d3ab9d..af8ad5084fa5fb30d58c97fa220ffa1abe744d50 100644 (file)
--- 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