6811578: genSolarisConstants.c should not require kernel patch to compile on Solaris 10
Reviewed-by: tbell
--- a/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c Fri Feb 27 10:53:33 2009 -0800
+++ b/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c Sun Mar 01 14:44:50 2009 +0000
@@ -68,37 +68,37 @@
DEFX(ACE_SETACL);
// ACL mask/flags/types
- DEFX(ACE_ACCESS_ALLOWED_ACE_TYPE);
- DEFX(ACE_ACCESS_DENIED_ACE_TYPE);
- DEFX(ACE_SYSTEM_AUDIT_ACE_TYPE);
- DEFX(ACE_SYSTEM_ALARM_ACE_TYPE);
- DEFX(ACE_READ_DATA);
- DEFX(ACE_LIST_DIRECTORY);
- DEFX(ACE_WRITE_DATA);
- DEFX(ACE_ADD_FILE);
- DEFX(ACE_APPEND_DATA);
- DEFX(ACE_ADD_SUBDIRECTORY);
- DEFX(ACE_READ_NAMED_ATTRS);
- DEFX(ACE_WRITE_NAMED_ATTRS);
- DEFX(ACE_EXECUTE);
- DEFX(ACE_DELETE_CHILD);
- DEFX(ACE_READ_ATTRIBUTES);
- DEFX(ACE_WRITE_ATTRIBUTES);
- DEFX(ACE_DELETE);
- DEFX(ACE_READ_ACL);
- DEFX(ACE_WRITE_ACL);
- DEFX(ACE_WRITE_OWNER);
- DEFX(ACE_SYNCHRONIZE);
- DEFX(ACE_FILE_INHERIT_ACE);
- DEFX(ACE_DIRECTORY_INHERIT_ACE);
- DEFX(ACE_NO_PROPAGATE_INHERIT_ACE);
- DEFX(ACE_INHERIT_ONLY_ACE);
- DEFX(ACE_SUCCESSFUL_ACCESS_ACE_FLAG);
- DEFX(ACE_FAILED_ACCESS_ACE_FLAG);
- DEFX(ACE_IDENTIFIER_GROUP);
- DEFX(ACE_OWNER);
- DEFX(ACE_GROUP);
- DEFX(ACE_EVERYONE);
+ emitX("ACE_ACCESS_ALLOWED_ACE_TYPE", 0x0000);
+ emitX("ACE_ACCESS_DENIED_ACE_TYPE", 0x0001);
+ emitX("ACE_SYSTEM_AUDIT_ACE_TYPE", 0x0002);
+ emitX("ACE_SYSTEM_ALARM_ACE_TYPE", 0x0003);
+ emitX("ACE_READ_DATA", 0x00000001);
+ emitX("ACE_LIST_DIRECTORY", 0x00000001);
+ emitX("ACE_WRITE_DATA", 0x00000002);
+ emitX("ACE_ADD_FILE", 0x00000002);
+ emitX("ACE_APPEND_DATA", 0x00000004);
+ emitX("ACE_ADD_SUBDIRECTORY", 0x00000004);
+ emitX("ACE_READ_NAMED_ATTRS", 0x00000008);
+ emitX("ACE_WRITE_NAMED_ATTRS", 0x00000010);
+ emitX("ACE_EXECUTE", 0x00000020);
+ emitX("ACE_DELETE_CHILD", 0x00000040);
+ emitX("ACE_READ_ATTRIBUTES", 0x00000080);
+ emitX("ACE_WRITE_ATTRIBUTES", 0x00000100);
+ emitX("ACE_DELETE", 0x00010000);
+ emitX("ACE_READ_ACL", 0x00020000);
+ emitX("ACE_WRITE_ACL", 0x00040000);
+ emitX("ACE_WRITE_OWNER", 0x00080000);
+ emitX("ACE_SYNCHRONIZE", 0x00100000);
+ emitX("ACE_FILE_INHERIT_ACE", 0x0001);
+ emitX("ACE_DIRECTORY_INHERIT_ACE", 0x0002);
+ emitX("ACE_NO_PROPAGATE_INHERIT_ACE", 0x0004);
+ emitX("ACE_INHERIT_ONLY_ACE", 0x0008);
+ emitX("ACE_SUCCESSFUL_ACCESS_ACE_FLAG", 0x0010);
+ emitX("ACE_FAILED_ACCESS_ACE_FLAG", 0x0020);
+ emitX("ACE_IDENTIFIER_GROUP", 0x0040);
+ emitX("ACE_OWNER", 0x1000);
+ emitX("ACE_GROUP", 0x2000);
+ emitX("ACE_EVERYONE", 0x4000);
out("} ");
return 0;