diff options
| author | Bernard Xiong <[email protected]> | 2018-07-17 20:41:31 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-17 20:41:31 +0800 |
| commit | 414bd03063eea4cc27e52c5c5ad0581bfc8e5997 (patch) | |
| tree | 514d178aa2a7ca80e30449c3e69d4ed978457cd2 | |
| parent | c385b7922b11d81edc7740a9f6d248880a04ccc7 (diff) | |
| parent | b822ac8ff62f3f065c7db64454c9359c00c59255 (diff) | |
Merge pull request #1637 from liangyongxiang/heap
[libc] fix compilation error when RT_USING_HEAP is disable
| -rw-r--r-- | components/libc/compilers/armlibc/mem_std.c | 2 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/syscall_mem.c | 2 |
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 |