Changeset 985e26d2 in mainline for uspace/lib/libc/include/malloc.h

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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/libc/include/malloc.h (modified) (1 diff)

uspace/lib/libc/include/malloc.h

@@ -42 +42 @@
 
 extern void *malloc(const size_t size);
+extern void *calloc(const size_t nmemb, const size_t size);
 extern void *memalign(const size_t align, const size_t size);
 extern void *realloc(const void *addr, const size_t size);