Changeset 15d0046 in mainline for uspace/lib/mbr/libmbr.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/mbr/libmbr.c (modified) (1 diff)

uspace/lib/mbr/libmbr.c

@@ -90 +90 @@
 mbr_t *mbr_alloc_mbr(void)
 {
-        return malloc(sizeof(mbr_t));
+        return (mbr_t *)alloc_br();
 }