diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
| commit | b3a50f0f3e287d63fce274e29641a3bc57405d5d (patch) | |
| tree | 1db867d2e5c40d9cd530424c022768f6f282251f /py/modarray.c | |
| parent | ed07d035d52764b3b02bfa8488f2e0445c28ea2f (diff) | |
| parent | 8993fb6cf0677ce980ab56cbad326e4e6bc47811 (diff) | |
| download | micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.tar.gz micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.zip | |
Merge branch 'master' into unicode
Conflicts:
py/mpconfig.h
Diffstat (limited to 'py/modarray.c')
| -rw-r--r-- | py/modarray.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/py/modarray.c b/py/modarray.c index 3ff567f1d9..c0fe331643 100644 --- a/py/modarray.c +++ b/py/modarray.c @@ -30,6 +30,8 @@ #include "obj.h" #include "builtin.h" +#if MICROPY_PY_ARRAY + STATIC const mp_map_elem_t mp_module_array_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_array) }, { MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&mp_type_array }, @@ -51,3 +53,5 @@ const mp_obj_module_t mp_module_array = { .name = MP_QSTR_array, .globals = (mp_obj_dict_t*)&mp_module_array_globals, }; + +#endif |