From 3f07132e0f1751aec499965a1363f5f8ab58be04 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Wed, 2 Jun 2021 23:04:44 +0200 Subject: [PATCH 1/2] LVGL remove compilation warning --- lib/libesp32_lvgl/freetype/devel/ftstdlib.h | 8 ++++---- tasmota/xdrv_54_lvgl.ino | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libesp32_lvgl/freetype/devel/ftstdlib.h b/lib/libesp32_lvgl/freetype/devel/ftstdlib.h index 44c97cdfe..e96edeb9d 100644 --- a/lib/libesp32_lvgl/freetype/devel/ftstdlib.h +++ b/lib/libesp32_lvgl/freetype/devel/ftstdlib.h @@ -140,10 +140,10 @@ extern void *lvbe_malloc(size_t size); extern void *lvbe_realloc(void *ptr, size_t size); extern void *lvbe_calloc(size_t num, size_t size); -#define ft_scalloc berry_calloc -#define ft_sfree free -#define ft_smalloc berry_malloc -#define ft_srealloc berry_realloc +#define ft_scalloc lvbe_calloc +#define ft_sfree lvbe_free +#define ft_smalloc lvbe_malloc +#define ft_srealloc lvbe_realloc /************************************************************************** diff --git a/tasmota/xdrv_54_lvgl.ino b/tasmota/xdrv_54_lvgl.ino index d72bb4cdd..b95318e4d 100644 --- a/tasmota/xdrv_54_lvgl.ino +++ b/tasmota/xdrv_54_lvgl.ino @@ -317,6 +317,7 @@ extern "C" { */ void *lvbe_malloc(uint32_t size); void *lvbe_realloc(void *ptr, size_t size); + void *lvbe_calloc(size_t num, size_t size); #ifdef USE_BERRY_PSRAM void *lvbe_malloc(uint32_t size) { return special_malloc(size); From 79e71d26a1cfbec8f1dd3e5e05ad8756945e20d0 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Wed, 2 Jun 2021 23:07:44 +0200 Subject: [PATCH 2/2] More fix --- lib/libesp32_lvgl/freetype/devel/ftstdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libesp32_lvgl/freetype/devel/ftstdlib.h b/lib/libesp32_lvgl/freetype/devel/ftstdlib.h index e96edeb9d..8a21a6adb 100644 --- a/lib/libesp32_lvgl/freetype/devel/ftstdlib.h +++ b/lib/libesp32_lvgl/freetype/devel/ftstdlib.h @@ -139,6 +139,7 @@ extern int lvbe_ftell(lvbe_FILE * stream); extern void *lvbe_malloc(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_free(void *ptr); #define ft_scalloc lvbe_calloc #define ft_sfree lvbe_free