merging in many of Andreas changes

Merge of xfs-cmds-2.4.18:slinx:112840a by nathans.

1 files changed, 4 insertions, 4 deletions

diff --git a/include/acl_ea.h b/include/acl_ea.h
index cf36455..ae6520e 100644
--- a/include/acl_ea.h
+++ b/include/acl_ea.h
@@ -12,13 +12,13 @@
 #define ACL_EA_VERSION		0x0002
 
 typedef struct {
-	__u16		e_tag;
-	__u16		e_perm;
-	__u32		e_id;
+	u_int16_t	e_tag;
+	u_int16_t	e_perm;
+	u_int32_t	e_id;
 } acl_ea_entry;
 
 typedef struct {
-	__u32		a_version;
+	u_int32_t	a_version;
 	acl_ea_entry	a_entries[0];
 } acl_ea_header;