am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '286ab6ce08acb5585ccc02ddf54d7654118fe11b':
  libdiskconfig: Use uintptr_t instead of uint32_t
This commit is contained in:
Elliott Hughes 2013-12-17 21:25:34 +00:00 committed by Android Git Automerger
commit 417e746770

View file

@ -88,7 +88,7 @@ mk_pri_pentry(struct disk_info *dinfo, struct part_info *pinfo, int pnum,
/* DO NOT DEREFERENCE */
struct pc_boot_record *mbr = (void *)PC_MBR_DISK_OFFSET;
/* grab the offset in mbr where to write this partition entry. */
item->offset = (loff_t)((uint32_t)((uint8_t *)(&mbr->ptable[pnum])));
item->offset = (loff_t)((uintptr_t)((uint8_t *)(&mbr->ptable[pnum])));
}
pentry = (struct pc_partition *) &item->data;