mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12274 from s-hadinger/lvgl_remove_warning 

LVGL remove compilation warning
This commit is contained in:
s-hadinger 2021-06-02 23:22:08 +02:00 committed by GitHub
parent 89d790de5c 79e71d26a1
commit 6ee612d5e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libesp32_lvgl/freetype/devel/ftstdlib.h
View File

@ -139,11 +139,12 @@ extern int lvbe_ftell(lvbe_FILE * stream);
extern void *lvbe_malloc(size_t size); extern void *lvbe_malloc(size_t size);
extern void *lvbe_realloc(void *ptr, size_t size); extern void *lvbe_realloc(void *ptr, size_t size);
extern void *lvbe_calloc(size_t num, size_t size); extern void *lvbe_calloc(size_t num, size_t size);
extern void lvbe_free(void *ptr);
#define ft_scalloc berry_calloc #define ft_scalloc lvbe_calloc
#define ft_sfree free #define ft_sfree lvbe_free
#define ft_smalloc berry_malloc #define ft_smalloc lvbe_malloc
#define ft_srealloc berry_realloc #define ft_srealloc lvbe_realloc
/************************************************************************** /**************************************************************************

1
tasmota/xdrv_54_lvgl.ino
View File

@ -317,6 +317,7 @@ extern "C" {
*/ */
void *lvbe_malloc(uint32_t size); void *lvbe_malloc(uint32_t size);
void *lvbe_realloc(void *ptr, size_t size); void *lvbe_realloc(void *ptr, size_t size);
void *lvbe_calloc(size_t num, size_t size);
#ifdef USE_BERRY_PSRAM #ifdef USE_BERRY_PSRAM
void *lvbe_malloc(uint32_t size) { void *lvbe_malloc(uint32_t size) {
return special_malloc(size); return special_malloc(size);