diff options
| author | sommersoft <sommersoft@gmail.com> | 2019-07-31 16:44:43 -0500 |
|---|---|---|
| committer | sommersoft <sommersoft@gmail.com> | 2019-07-31 16:44:43 -0500 |
| commit | 9939d0c4f49db084f52a12b6ea5f6ce97b614146 (patch) | |
| tree | 6c338f9e01c581793255757b4483d3d88824095f /py/objmodule.c | |
| parent | a498bcd94d7f869e2cb2e992babacb981de688c0 (diff) | |
| parent | 366fdcce18e148a6828b7a7074e1e4198fca3595 (diff) | |
Merge branch 'master' of https://github.com/adafruit/circuitpython into mixer_voice
Diffstat (limited to 'py/objmodule.c')
| -rw-r--r-- | py/objmodule.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/py/objmodule.c b/py/objmodule.c index 469a95976..627ba79e8 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -32,6 +32,8 @@ #include "py/runtime.h" #include "py/builtin.h" +#include "genhdr/moduledefs.h" + STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { (void)kind; mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in); @@ -252,6 +254,11 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = { // extra builtin modules as defined by a port MICROPY_PORT_BUILTIN_MODULES + #ifdef MICROPY_REGISTERED_MODULES + // builtin modules declared with MP_REGISTER_MODULE() + MICROPY_REGISTERED_MODULES + #endif + #if defined(MICROPY_DEBUG_MODULES) && defined(MICROPY_PORT_BUILTIN_DEBUG_MODULES) , MICROPY_PORT_BUILTIN_DEBUG_MODULES #endif |