diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-05-11 17:35:43 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-05-11 17:35:43 +0100 |
| commit | 89755ae67f5c4a7cf7c963a53b12489461f0d839 (patch) | |
| tree | 0233baa5d8d337c99cfd792d3940ea3c3e31d4e7 /py/modsys.c | |
| parent | f92a0d4d169adeb9a06618c66b2f9a2885f61133 (diff) | |
py: Rename MICROPY_SYS_EXIT to MICROPY_MOD_SYS_EXIT.
For consistency with MICROPY_MOD_SYS_STDFILES, etc.
Diffstat (limited to 'py/modsys.c')
| -rw-r--r-- | py/modsys.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/py/modsys.c b/py/modsys.c index d133d6b27..954711a5a 100644 --- a/py/modsys.c +++ b/py/modsys.c @@ -36,11 +36,10 @@ #if MICROPY_ENABLE_MOD_SYS -MP_DECLARE_CONST_FUN_OBJ(mp_sys_exit_obj); - // These should be implemented by ports, specific types don't matter, // only addresses. struct _dummy_t; +extern struct _dummy_t mp_sys_exit_obj; extern struct _dummy_t mp_sys_stdin_obj; extern struct _dummy_t mp_sys_stdout_obj; extern struct _dummy_t mp_sys_stderr_obj; @@ -55,10 +54,6 @@ STATIC const MP_DEFINE_STR_OBJ(version_obj, "3.4.0"); STATIC const mp_map_elem_t mp_module_sys_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_sys) }, -#if MICROPY_SYS_EXIT - // Should be implemented by port - { MP_OBJ_NEW_QSTR(MP_QSTR_exit), (mp_obj_t)&mp_sys_exit_obj }, -#endif { MP_OBJ_NEW_QSTR(MP_QSTR_path), (mp_obj_t)&mp_sys_path_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_argv), (mp_obj_t)&mp_sys_argv_obj }, @@ -70,6 +65,10 @@ STATIC const mp_map_elem_t mp_module_sys_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_byteorder), MP_OBJ_NEW_QSTR(MP_QSTR_big) }, #endif +#if MICROPY_MOD_SYS_EXIT + { MP_OBJ_NEW_QSTR(MP_QSTR_exit), (mp_obj_t)&mp_sys_exit_obj }, +#endif + #if MICROPY_MOD_SYS_STDFILES { MP_OBJ_NEW_QSTR(MP_QSTR_stdin), (mp_obj_t)&mp_sys_stdin_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_stdout), (mp_obj_t)&mp_sys_stdout_obj }, |