summaryrefslogtreecommitdiff
path: root/components/libc
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2014-10-14 23:24:02 +0800
committerBernard Xiong <[email protected]>2014-10-14 23:24:02 +0800
commit2fc3db65799a126c5c1abdac7f732d2386f09170 (patch)
tree401c6dc01b37ba77e9d60fbd23ca8a2fe46a6f51 /components/libc
parenta4bb77d09740df6838fcf5a818da3ad0975a4293 (diff)
parente03045122053ab8bc1422e03ae723db9ac7ffa98 (diff)
Merge pull request #353 from grissiom/misc-fix
Misc fix
Diffstat (limited to 'components/libc')
-rw-r--r--components/libc/minilibc/stdlib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/libc/minilibc/stdlib.c b/components/libc/minilibc/stdlib.c
index 51cb07fee0..e29ae9bc2e 100644
--- a/components/libc/minilibc/stdlib.c
+++ b/components/libc/minilibc/stdlib.c
@@ -54,6 +54,7 @@ long int atol(const char* s)
return sign?-v:v;
}
+#ifdef RT_USING_HEAP
void *malloc(size_t size)
{
return rt_malloc(size);
@@ -73,5 +74,6 @@ void *calloc(size_t nelem, size_t elsize)
{
return rt_calloc(nelem, elsize);
}
+#endif
#endif