diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-07 22:02:35 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-07 22:02:35 +0100 |
| commit | d31a093f9c2bdc3c94917c928fb2cc8c26b39959 (patch) | |
| tree | 8d45798562c303ebfdf889e3babdfbb0b2abc210 /py/modsys.c | |
| parent | f0778a7ccbbdd1d7bf116a6939c7eb05173e1987 (diff) | |
| parent | 5473f743f37e12921f4acb11fa84fe0d2b9d0650 (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Conflicts:
py/emitglue.c
Diffstat (limited to 'py/modsys.c')
| -rw-r--r-- | py/modsys.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/py/modsys.c b/py/modsys.c index 738758bdf..a99db1b7f 100644 --- a/py/modsys.c +++ b/py/modsys.c @@ -51,6 +51,9 @@ mp_obj_list_t mp_sys_argv_obj; STATIC const mp_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {I(3), I(4), I(0)}}; #undef I STATIC const MP_DEFINE_STR_OBJ(version_obj, "3.4.0"); +#ifdef MICROPY_PY_SYS_PLATFORM +STATIC const MP_DEFINE_STR_OBJ(platform_obj, MICROPY_PY_SYS_PLATFORM); +#endif 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) }, @@ -59,6 +62,9 @@ STATIC const mp_map_elem_t mp_module_sys_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_argv), (mp_obj_t)&mp_sys_argv_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_version), (mp_obj_t)&version_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_version_info), (mp_obj_t)&mp_sys_version_info_obj }, +#ifdef MICROPY_PY_SYS_PLATFORM + { MP_OBJ_NEW_QSTR(MP_QSTR_platform), (mp_obj_t)&platform_obj }, +#endif #if MP_ENDIANNESS_LITTLE { MP_OBJ_NEW_QSTR(MP_QSTR_byteorder), MP_OBJ_NEW_QSTR(MP_QSTR_little) }, #else |