libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4788 from yangjie11/memheap 

[src] add RT_WEAK for rt_malloc_align,rt_free_align
This commit is contained in:
Bernard Xiong 2021-06-12 11:56:52 +08:00 committed by GitHub
parent a52e147cea fa1f1ef485
commit 2be1cb420f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kservice.c
View File

@ -1238,7 +1238,7 @@ RTM_EXPORT(rt_kprintf);
*
* @return the allocated memory block on successful, otherwise returns RT_NULL
*/
void *rt_malloc_align(rt_size_t size, rt_size_t align)
RT_WEAK void *rt_malloc_align(rt_size_t size, rt_size_t align)
{
void *ptr;
void *align_ptr;
@ -1284,7 +1284,7 @@ RTM_EXPORT(rt_malloc_align);
*
* @param ptr the memory block pointer
*/
void rt_free_align(void *ptr)
RT_WEAK void rt_free_align(void *ptr)
{
void *real_ptr;

2
src/memheap.c
View File

@ -757,6 +757,8 @@ static struct rt_memheap _heap;
void rt_system_heap_init(void *begin_addr, void *end_addr)
{
RT_ASSERT((rt_uint32_t)end_addr > (rt_uint32_t)begin_addr);
/* initialize a default heap in the system */
rt_memheap_init(&_heap,
"heap",