Skip to content

Commit

Permalink
Remove duplicate definitions
Browse files Browse the repository at this point in the history
  • Loading branch information
lewisxhe committed Dec 3, 2020
1 parent 5f7e3a8 commit acad456
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/lv_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ typedef int16_t lv_coord_t;
/* Automatically defrag. on free. Defrag. means joining the adjacent free cells. */
# define LV_MEM_AUTO_DEFRAG 1
#else /*LV_MEM_CUSTOM*/
# define LV_MEM_CUSTOM_INCLUDE <stdlib.h> /*Header for the dynamic memory function*/

#define LV_MEM_CUSTOM_INCLUDE <stdlib.h> /*Header for the dynamic memory function*/

#if defined(BOARD_HAS_PSRAM)
/* Until Espressif corrects their own hearder */
# include <stddef.h>
Expand All @@ -104,7 +106,6 @@ typedef int16_t lv_coord_t;
#else
# define LV_MEM_CUSTOM_ALLOC malloc /*Wrapper to malloc*/
#endif
# define LV_MEM_CUSTOM_ALLOC malloc /*Wrapper to malloc*/
# define LV_MEM_CUSTOM_FREE free /*Wrapper to free*/
#endif /*LV_MEM_CUSTOM*/

Expand Down

0 comments on commit acad456

Please sign in to comment.