Mercurial > illumos > illumos-gate

changeset 12012:32b94791f957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6938228 Needs to be easier to sync zfs boot support in grub with libfsimage/pygrub
author Mark Johnson <mark.r.johnson@oracle.com>
date Fri, 26 Mar 2010 14:22:56 -0700
parents 2377022c7a2d
children a41a3263e845
files usr/src/grub/grub-0.97/stage2/fsys_zfs.h
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.h	Fri Mar 26 14:13:35 2010 -0700
+++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.h	Fri Mar 26 14:22:56 2010 -0700
@@ -25,6 +25,7 @@
 
 #ifdef	FSYS_ZFS
 
+#ifndef	FSIMAGE
 typedef unsigned long long uint64_t;
 typedef unsigned int uint32_t;
 typedef unsigned short uint16_t;
@@ -36,6 +37,9 @@
 #else
 typedef	unsigned int size_t;
 #endif
+#else
+#include "fsi_zfs.h"
+#endif	/* !FSIMAGE */
 
 #include <zfs-include/zfs.h>
 #include <zfs-include/dmu.h>