commit 3278af85f984a1b6df56b010a93589f6068514e0
author Elliott Hughes <enh@google.com> Tue Dec 17 13:19:42 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 17 13:19:42 2013 -0800
tree 9919ac96cda3f52966a4082b8cbaf0b17d159774
parent 348856fadb03cd0d93d0af3f78c11555a343e97f
parent 30f9b5092062a0c8b61356496128feaaf8cd4237

am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
  libdiskconfig: Use uintptr_t instead of uint32_t

libdiskconfig/config_mbr.c

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 @@
         /* 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;