diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-17 21:28:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-17 21:28:41 +0000 |
| commit | d9f2f8a1b24d16cb98a36dc77f092529e81b034c (patch) | |
| tree | 19c8044b3a15012bea75148251f93fa10bd9cab6 | |
| parent | fed76f85154950a4b2c63ac9e749ee23603e4d2b (diff) | |
| parent | 417e7467703e637f384530f23850cb2bf852e61b (diff) | |
| download | system_core-d9f2f8a1b24d16cb98a36dc77f092529e81b034c.zip system_core-d9f2f8a1b24d16cb98a36dc77f092529e81b034c.tar.gz system_core-d9f2f8a1b24d16cb98a36dc77f092529e81b034c.tar.bz2 | |
am 417e7467: am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
* commit '417e7467703e637f384530f23850cb2bf852e61b':
libdiskconfig: Use uintptr_t instead of uint32_t
| -rw-r--r-- | libdiskconfig/config_mbr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c index b89d382..7641b29 100644 --- a/libdiskconfig/config_mbr.c +++ b/libdiskconfig/config_mbr.c @@ -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; |