fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Define MICROPY_INCLUDED_PY_MPSTATE_H defore include lv_gc.h (#23)

Browse Source 
In order to avoid recursive inclusion, exclude `py/mpstate.h` when it's included from `mpconfigport.h` through `lvgl/src/lv_misc/lv_gc.h`.  
This removes the need to include `LV_GC_INCLUDE` everywhere in lvgl. Instead, `LV_GC_INCLUDE` can be included once only from `lvgl/src/lv_misc/lv_gc.h`.  
See related PR: https://github.com/lvgl/lvgl/pull/2010
This commit is contained in:
Xiang Xiao 2021-01-11 14:43:43 -06:00 committed by GitHub
parent a9112af45f
commit ef78bcb80b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/esp32/mpconfigport.h
View File

@ -258,7 +258,13 @@ extern void lv_deinit(void);
struct _machine_timer_obj_t;
#if MICROPY_PY_LVGL
#ifndef MICROPY_INCLUDED_PY_MPSTATE_H
#define MICROPY_INCLUDED_PY_MPSTATE_H
#include "lib/lv_bindings/lvgl/src/lv_misc/lv_gc.h"
#undef MICROPY_INCLUDED_PY_MPSTATE_H
#else
#include "lib/lv_bindings/lvgl/src/lv_misc/lv_gc.h"
#endif
#else
#define LV_ROOTS
#endif

6
ports/stm32/mpconfigport.h
View File

@ -311,7 +311,13 @@ extern const struct _mp_obj_module_t mp_module_lodepng;
#define MP_STATE_PORT MP_STATE_VM
#if MICROPY_PY_LVGL
#ifndef MICROPY_INCLUDED_PY_MPSTATE_H
#define MICROPY_INCLUDED_PY_MPSTATE_H
#include "lib/lv_bindings/lvgl/src/lv_misc/lv_gc.h"
#undef MICROPY_INCLUDED_PY_MPSTATE_H
#else
#include "lib/lv_bindings/lvgl/src/lv_misc/lv_gc.h"
#endif
#else
#define LV_ROOTS
#endif

6
ports/unix/mpconfigport.h
View File

@ -259,7 +259,13 @@ extern const struct _mp_obj_module_t mp_module_lodepng;
#endif
#if MICROPY_PY_LVGL
#ifndef MICROPY_INCLUDED_PY_MPSTATE_H
#define MICROPY_INCLUDED_PY_MPSTATE_H
#include "lib/lv_bindings/lvgl/src/lv_misc/lv_gc.h"
#undef MICROPY_INCLUDED_PY_MPSTATE_H
#else
#include "lib/lv_bindings/lvgl/src/lv_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 },

6
ports/windows/mpconfigport.h
View File

@ -162,7 +162,13 @@ extern const struct _mp_obj_module_t mp_module_SDL;
extern const struct _mp_obj_module_t mp_module_lodepng;
#if MICROPY_PY_LVGL
#ifndef MICROPY_INCLUDED_PY_MPSTATE_H
#define MICROPY_INCLUDED_PY_MPSTATE_H
#include "lib/lv_bindings/lvgl/src/lv_misc/lv_gc.h"
#undef MICROPY_INCLUDED_PY_MPSTATE_H
#else
#include "lib/lv_bindings/lvgl/src/lv_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 },