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/mpconfig.h | |
| 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/mpconfig.h')
| -rw-r--r-- | py/mpconfig.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/py/mpconfig.h b/py/mpconfig.h index 5194ba028a..7ed99ac8e0 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -252,6 +252,10 @@ typedef double mp_float_t; // Whether str object is proper unicode #ifndef MICROPY_PY_BUILTINS_STR_UNICODE #define MICROPY_PY_BUILTINS_STR_UNICODE (0) + +// Whether to support bytearray object +#ifndef MICROPY_PY_BUILTINS_BYTEARRAY +#define MICROPY_PY_BUILTINS_BYTEARRAY (1) #endif // Whether to support set object @@ -274,6 +278,13 @@ typedef double mp_float_t; #define MICROPY_PY_BUILTINS_PROPERTY (1) #endif +// Whether to provide "array" module. Note that large chunk of the +// underlying code is shared with "bytearray" builtin type, so to +// get real savings, it should be disabled too. +#ifndef MICROPY_PY_ARRAY +#define MICROPY_PY_ARRAY (1) +#endif + // Whether to provide "collections" module #ifndef MICROPY_PY_COLLECTIONS #define MICROPY_PY_COLLECTIONS (1) |