commit d9f2f8a1b24d16cb98a36dc77f092529e81b034c
author Elliott Hughes <enh@google.com> Tue Dec 17 21:28:41 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 17 21:28:41 2013 +0000
tree 19c8044b3a15012bea75148251f93fa10bd9cab6
parent fed76f85154950a4b2c63ac9e749ee23603e4d2b
parent 417e7467703e637f384530f23850cb2bf852e61b

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

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;