Sync with HEAD: MFC rev. 1.9 & 1.10

This commit is contained in:
marcel 2006-07-07 02:02:55 +00:00
parent 3a998b0102
commit 43c958307c

View File

@ -65,7 +65,7 @@ struct gpt_ent {
uint64_t ent_lba_end;
uint64_t ent_attr;
#define GPT_ENT_ATTR_PLATFORM (1ULL << 0)
short ent_name[36]; /* UNICODE-16. */
uint16_t ent_name[36]; /* UTF-16. */
};
#define GPT_ENT_TYPE_UNUSED \
@ -113,4 +113,7 @@ struct gpt_ent {
#define GPT_ENT_TYPE_LINUX_LVM \
{0xe6d6d379,0xf507,0x44c2,0xa2,0x3c,{0x23,0x8f,0x2a,0x3d,0xf9,0x28}}
#define GPT_ENT_TYPE_APPLE_HFS \
{0x48465300,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
#endif /* _SYS_GPT_H_ */