diff options
| author | Mark Johnson <mark.r.johnson@oracle.com> | 2010-03-26 14:22:56 -0700 |
|---|---|---|
| committer | Mark Johnson <mark.r.johnson@oracle.com> | 2010-03-26 14:22:56 -0700 |
| commit | 2dd5848fa9da42f374782814f362e0afda124ecd (patch) | |
| tree | 3aeed58a473e20a5c7a15a69267b12de22d00060 /usr/src | |
| parent | 7bd3a2e26cc8569257b88c1691d559138e1d32d0 (diff) | |
| download | illumos-gate-2dd5848fa9da42f374782814f362e0afda124ecd.tar.gz | |
6938228 Needs to be easier to sync zfs boot support in grub with libfsimage/pygrub
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/fsys_zfs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/grub/grub-0.97/stage2/fsys_zfs.h b/usr/src/grub/grub-0.97/stage2/fsys_zfs.h index a4478c4c65..d439392f3f 100644 --- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.h +++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.h @@ -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 @@ typedef unsigned long size_t; #else typedef unsigned int size_t; #endif +#else +#include "fsi_zfs.h" +#endif /* !FSIMAGE */ #include <zfs-include/zfs.h> #include <zfs-include/dmu.h> |