summaryrefslogtreecommitdiff
path: root/components/libc
diff options
context:
space:
mode:
authorliang yongxiang <[email protected]>2018-07-17 11:01:14 +0800
committerliang yongxiang <[email protected]>2018-07-17 11:24:47 +0800
commitb822ac8ff62f3f065c7db64454c9359c00c59255 (patch)
treeee78c1f078316fe22438fb886a02988c25e88e34 /components/libc
parentec0e5489736d4e74a6ca5687598600f2357c6d47 (diff)
[libc] fix compilation error when RT_USING_HEAP is disable
Diffstat (limited to 'components/libc')
-rw-r--r--components/libc/compilers/armlibc/mem_std.c2
-rw-r--r--components/libc/compilers/dlib/syscall_mem.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/components/libc/compilers/armlibc/mem_std.c b/components/libc/compilers/armlibc/mem_std.c
index 5da5bb6c6c..7fa0033f9d 100644
--- a/components/libc/compilers/armlibc/mem_std.c
+++ b/components/libc/compilers/armlibc/mem_std.c
@@ -15,6 +15,7 @@
#include "rtthread.h"
+#ifdef RT_USING_HEAP
/* avoid the heap and heap-using library functions supplied by arm */
#pragma import(__use_no_heap)
@@ -41,3 +42,4 @@ void free(void *rmem)
rt_free(rmem);
}
RTM_EXPORT(free);
+#endif
diff --git a/components/libc/compilers/dlib/syscall_mem.c b/components/libc/compilers/dlib/syscall_mem.c
index 05e79f50b2..b3933ba910 100644
--- a/components/libc/compilers/dlib/syscall_mem.c
+++ b/components/libc/compilers/dlib/syscall_mem.c
@@ -23,6 +23,7 @@
*/
#include <rtthread.h>
+#ifdef RT_USING_HEAP
void *malloc(rt_size_t n)
{
return rt_malloc(n);
@@ -42,3 +43,4 @@ void free(void *rmem)
{
rt_free(rmem);
}
+#endif