Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9f2f8a1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 417e7467: am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use... 

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

* commit '417e7467':
  libdiskconfig: Use uintptr_t instead of uint32_t
parents fed76f85 417e7467

libdiskconfig/config_mbr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;