Avoid including hostfile.h when not necessarry as it pulls

in OS-specific headers which may redefine generic names
	like "far".
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-10 09:18:06 +02:00
parent ad297ec734
commit 71c1d67a34
7 changed files with 10 additions and 2 deletions

View file

@ -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:

View file

@ -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;

View file

@ -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);

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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