From 71254f9e1705eee17e176889ab481643b62e78c6 Mon Sep 17 00:00:00 2001 From: Amir Gonnen Date: Sat, 19 Aug 2023 01:25:36 +0300 Subject: [PATCH] Remove lv_gc.h include Related: https://github.com/lvgl/lvgl/issues/4358#issuecomment-1679860859 --- ports/rp2/mpconfigport.h | 12 ------------ ports/windows/mpconfigport.h | 8 -------- 2 files changed, 20 deletions(-) diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h index 61b951221145..95a600fe6b46 100644 --- a/ports/rp2/mpconfigport.h +++ b/ports/rp2/mpconfigport.h @@ -201,18 +201,6 @@ extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k; #define MICROPY_BOARD_NETWORK_INTERFACES #endif -#if MICROPY_PY_LVGL -#ifndef MICROPY_INCLUDED_PY_MPSTATE_H -#define MICROPY_INCLUDED_PY_MPSTATE_H -#include "lib/lv_bindings/lvgl/src/misc/lv_gc.h" -#undef MICROPY_INCLUDED_PY_MPSTATE_H -#else -#include "lib/lv_bindings/lvgl/src/misc/lv_gc.h" -#endif -#else -#define LV_ROOTS -#endif - #define MICROPY_PORT_NETWORK_INTERFACES \ MICROPY_HW_NIC_CYW43 \ MICROPY_HW_NIC_NINAW10 \ diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h index 8efc2365d97f..46970d5e1231 100644 --- a/ports/windows/mpconfigport.h +++ b/ports/windows/mpconfigport.h @@ -199,13 +199,6 @@ extern const struct _mp_obj_module_t mp_module_lvindev; extern const struct _mp_obj_module_t mp_module_SDL; #if MICROPY_PY_LVGL -#ifndef MICROPY_INCLUDED_PY_MPSTATE_H -#define MICROPY_INCLUDED_PY_MPSTATE_H -#include "lib/lv_bindings/lvgl/src/misc/lv_gc.h" -#undef MICROPY_INCLUDED_PY_MPSTATE_H -#else -#include "lib/lv_bindings/lvgl/src/misc/lv_gc.h" -#endif #define MICROPY_PY_LVGL_DEF { MP_OBJ_NEW_QSTR(MP_QSTR_lvgl), (mp_obj_t)&mp_module_lvgl }, #if MICROPY_PY_LVGL_SDL #define MICROPY_PY_LVGL_SDL_DEF { MP_OBJ_NEW_QSTR(MP_QSTR_SDL), (mp_obj_t)&mp_module_SDL }, @@ -213,7 +206,6 @@ extern const struct _mp_obj_module_t mp_module_SDL; #define MICROPY_PY_LVGL_SDL_DEF #endif #else - #define LV_ROOTS #define MICROPY_PY_LVGL_DEF #endif