diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-05-02 13:47:01 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-05-02 13:47:01 +0100 |
| commit | df3a8c64343ff56f1d2588a21a4a566679fdc6d4 (patch) | |
| tree | ccd12609e27cfe344ab2455071254856a1e61e01 /tools/libfsimage | |
| parent | b2870e0a214f9c663c37992385a25011954828c6 (diff) | |
| download | xen-df3a8c64343ff56f1d2588a21a4a566679fdc6d4.tar.gz xen-df3a8c64343ff56f1d2588a21a4a566679fdc6d4.tar.bz2 xen-df3a8c64343ff56f1d2588a21a4a566679fdc6d4.zip | |
[libfsimage/zfs] compilation fix ZFS libfsimage support.
Depending on environments, zfs libfsimage support doesn't compile.
This patch fixes it.
ia64-linux-gnu-gcc -DPIC -O2 -fomit-frame-pointer
-fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes
-Wno-unused-value -Wdeclaration-after-statement
-I/usr/ia64-linux-gnu/
sys-root/usr/include -D__XEN_TOOLS__ -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -I../../../tools/libfsimage/common/ -Werror
-Wp,-MD,.zfs_lzjb.opic.d -fPIC -c -o zfs_lzjb.opic zfs_
lzjb.c
In file included from fsys_zfs.h:41,
from zfs_lzjb.c:25:
zfs-include/zfs_acl.h:29: error: redefinition of typedef uid_t
/usr/ia64-linux-gnu/sys-root/usr/include/sys/types.h:82: error:
previous declaration of uid_t was here
This depends on how __uid_t is defined in the system header.
No file under the zfs directory uses uid_t so that just removing
the definition in the zfs_acl.h looks reasonable.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Diffstat (limited to 'tools/libfsimage')
| -rw-r--r-- | tools/libfsimage/zfs/zfs-include/zfs_acl.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/libfsimage/zfs/zfs-include/zfs_acl.h b/tools/libfsimage/zfs/zfs-include/zfs_acl.h index 56f75b1321..5f096308bf 100644 --- a/tools/libfsimage/zfs/zfs-include/zfs_acl.h +++ b/tools/libfsimage/zfs/zfs-include/zfs_acl.h @@ -24,11 +24,6 @@ #ifndef _SYS_FS_ZFS_ACL_H #define _SYS_FS_ZFS_ACL_H -#ifndef _UID_T -#define _UID_T -typedef unsigned int uid_t; /* UID type */ -#endif /* _UID_T */ - typedef struct zfs_oldace { uint32_t z_fuid; /* "who" */ uint32_t z_access_mask; /* access mask */ |