Skip to content

Commit e2ff86b

Browse files
author
Me No Dev
committed
Merge remote-tracking branch 'esp8266/master'
2 parents f799ede + 1588b45 commit e2ff86b

File tree

139 files changed

+15534
-952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+15534
-952
lines changed

cores/esp8266/heap.c

+21
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@
66
#include <stdlib.h>
77
#include "umm_malloc/umm_malloc.h"
88
#include <c_types.h>
9+
#include <sys/reent.h>
10+
11+
void* _malloc_r(struct _reent* unused, size_t size)
12+
{
13+
return malloc(size);
14+
}
15+
16+
void _free_r(struct _reent* unused, void* ptr)
17+
{
18+
return free(ptr);
19+
}
20+
21+
void* _realloc_r(struct _reent* unused, void* ptr, size_t size)
22+
{
23+
return realloc(ptr, size);
24+
}
25+
26+
void* _calloc_r(struct _reent* unused, size_t count, size_t size)
27+
{
28+
return calloc(count, size);
29+
}
930

1031
void* ICACHE_RAM_ATTR pvPortMalloc(size_t size, const char* file, int line)
1132
{

0 commit comments

Comments
 (0)