summaryrefslogtreecommitdiffstats
path: root/libc/stdlib/malloc-simple/alloc.c
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-12-02 01:52:28 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-12-02 01:52:28 +0000
commit450f92eb7165131ff3fdb2f80ec2fc65254f5ccb (patch)
tree4a0260d6717520379b98af80419feda2ca7cea29 /libc/stdlib/malloc-simple/alloc.c
parent6fd3ac79613c9e1832513b0f614860be2735993f (diff)
downloaduClibc-alpine-450f92eb7165131ff3fdb2f80ec2fc65254f5ccb.tar.bz2
uClibc-alpine-450f92eb7165131ff3fdb2f80ec2fc65254f5ccb.tar.xz
Merge from trunk.
Diffstat (limited to 'libc/stdlib/malloc-simple/alloc.c')
-rw-r--r--libc/stdlib/malloc-simple/alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
index ed14c37c4..7f0a91f0b 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -64,7 +64,7 @@ void * calloc(size_t nmemb, size_t lsize)
* doesn't need to actually zero anything....
*/
if (result != NULL) {
- memset(result, 0, size);
+ __memset(result, 0, size);
}
#endif
return result;
@@ -85,7 +85,7 @@ void *realloc(void *ptr, size_t size)
newptr = malloc(size);
if (newptr) {
- memcpy(newptr, ptr, *((size_t *) (ptr - sizeof(size_t))));
+ __memcpy(newptr, ptr, *((size_t *) (ptr - sizeof(size_t))));
free(ptr);
}
return newptr;