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/objarray.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/objarray.c')
| -rw-r--r-- | py/objarray.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/py/objarray.c b/py/objarray.c index 05821e8de4..b13df2bdba 100644 --- a/py/objarray.c +++ b/py/objarray.c @@ -37,6 +37,8 @@ #include "runtime.h" #include "binary.h" +#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY + typedef struct _mp_obj_array_t { mp_obj_base_t base; machine_uint_t typecode : 8; @@ -310,3 +312,5 @@ STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) { o->cur = 0; return o; } + +#endif // MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY |