vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-08-03 Robert Millan <rmh@gnu.org>

Browse source 
Fix grub-emu build.
	
	* include/grub/util/misc.h: Move `<grub/util/libzfs.h>' to ...
	* include/grub/emu/misc.h: ... here.
	
	* include/grub/util/misc.h (grub_get_libzfs_handle): Move function ...
	* include/grub/emu/misc.h (grub_get_libzfs_handle): ... here.
	
	* util/misc.c: Remove `<grub/util/libzfs.h>'.
	[HAVE_LIBZFS] (libzfs_handle, fini_libzfs)
	(grub_get_libzfs_handle): Move to ...
	* kern/emu/misc.c [HAVE_LIBZFS] (__libzfs_handle, fini_libzfs)
	(grub_get_libzfs_handle): ... here.
This commit is contained in:
Robert Millan 2010-08-03 23:51:48 +02:00
parent c9f7ff97cf
commit 9dd6fd50b4
5 changed files with 45 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
util/misc.c
View file

@ -36,7 +36,6 @@
#include <grub/misc.h>
#include <grub/cache.h>
#include <grub/util/misc.h>
#include <grub/util/libzfs.h>
#include <grub/mm.h>
#include <grub/term.h>
#include <grub/time.h>
@ -295,27 +294,6 @@ grub_util_init_nls (void)
#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
}
#ifdef HAVE_LIBZFS
static libzfs_handle_t *libzfs_handle;
static void
fini_libzfs (void)
{
libzfs_fini (libzfs_handle);
}
libzfs_handle_t *
grub_get_libzfs_handle (void)
{
if (! libzfs_handle)
{
libzfs_handle = libzfs_init ();
atexit (fini_libzfs);
}
return libzfs_handle;
}
#endif /* HAVE_LIBZFS */
#endif /* GRUB_UTIL */
int