--- a/usr/src/uts/common/fs/zfs/sys/zfs_acl.h	Mon Sep 04 19:32:13 2006 -0700
+++ b/usr/src/uts/common/fs/zfs/sys/zfs_acl.h	Tue Sep 05 11:37:36 2006 -0700
@@ -77,11 +77,11 @@
  * whereas acl_inherit has secure instead of groupmask.
  */
 
-#define	DISCARD		0
-#define	NOALLOW		1
-#define	GROUPMASK	2
-#define	PASSTHROUGH	3
-#define	SECURE		4
+#define	ZFS_ACL_DISCARD		0
+#define	ZFS_ACL_NOALLOW		1
+#define	ZFS_ACL_GROUPMASK	2
+#define	ZFS_ACL_PASSTHROUGH	3
+#define	ZFS_ACL_SECURE		4
 
 struct znode;