github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/littlevgl/lvgl

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-12-07 21:11:56 +01:00
parent da2ee84fbb 842283d136
commit 71be75b0ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_core/lv_debug.h
View File

@@ -49,7 +49,7 @@ void lv_debug_log_error(const char * msg, uint64_t value);
{ \ { \
if(!(expr)) { \ if(!(expr)) { \
LV_LOG_ERROR(__func__); \ LV_LOG_ERROR(__func__); \
lv_debug_log_error(msg, (uint64_t)value); \ lv_debug_log_error(msg, (uint64_t)((uintptr_t)value)); \
while(1); \ while(1); \
} \ } \
} }

2
src/lv_misc/lv_mem.c
View File

@@ -262,7 +262,7 @@ void * lv_mem_realloc(void * data_p, size_t new_size)
#else /* LV_ENABLE_GC */ #else /* LV_ENABLE_GC */
void * lv_mem_realloc(void * data_p, uint32_t new_size) void * lv_mem_realloc(void * data_p, size_t new_size)
{ {
void * new_p = LV_MEM_CUSTOM_REALLOC(data_p, new_size); void * new_p = LV_MEM_CUSTOM_REALLOC(data_p, new_size);
if(new_p == NULL) LV_LOG_WARN("Couldn't allocate memory"); if(new_p == NULL) LV_LOG_WARN("Couldn't allocate memory");