diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-02-21 11:09:44 -0500 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-02-21 11:09:44 -0500 |
| commit | 10d3a20f8a639ad8ef5555e2142052190e8a7e13 (patch) | |
| tree | ad72afa87cadb0e3749d60109cffdd768280cc00 /extmod | |
| parent | c5dbdbe88c099494cd14790b8c645020538eed27 (diff) | |
Add CIRCUITPY macro; rename u* only when CIRCUITPY=1
Diffstat (limited to 'extmod')
| -rw-r--r-- | extmod/modujson.c | 4 | ||||
| -rw-r--r-- | extmod/modure.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/extmod/modujson.c b/extmod/modujson.c index 80fccc8a1..6b24bf578 100644 --- a/extmod/modujson.c +++ b/extmod/modujson.c @@ -292,7 +292,11 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads); STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = { +#if CIRCUITPY { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) }, +#else + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ujson) }, +#endif { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_ujson_dump_obj) }, { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_ujson_dumps_obj) }, { MP_ROM_QSTR(MP_QSTR_load), MP_ROM_PTR(&mod_ujson_load_obj) }, diff --git a/extmod/modure.c b/extmod/modure.c index 6561362a8..e2556c41b 100644 --- a/extmod/modure.c +++ b/extmod/modure.c @@ -462,7 +462,11 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_sub_obj, 3, 5, mod_re_sub); #endif STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = { +#if CIRCUITPY { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_re) }, +#else + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ure) }, +#endif { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) }, { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&mod_re_match_obj) }, { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&mod_re_search_obj) }, |