diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-25 04:10:34 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-25 04:10:34 +0100 |
| commit | e973acde81462de0c205f27db2642a08022fb3a8 (patch) | |
| tree | c6862ead76ae12979b3c3d6d1ec20774884c72ef /py/builtintables.c | |
| parent | 780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff) | |
| parent | 939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/builtintables.c')
| -rw-r--r-- | py/builtintables.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/py/builtintables.c b/py/builtintables.c index 857a581de..8b4df9317 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -26,8 +26,8 @@ #include <stdlib.h> -#include "misc.h" #include "mpconfig.h" +#include "misc.h" #include "qstr.h" #include "obj.h" #include "builtin.h" @@ -44,7 +44,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_bool), (mp_obj_t)&mp_type_bool }, { MP_OBJ_NEW_QSTR(MP_QSTR_bytes), (mp_obj_t)&mp_type_bytes }, { MP_OBJ_NEW_QSTR(MP_QSTR_bytearray), (mp_obj_t)&mp_type_bytearray }, -#if MICROPY_PY_BUILTINS_FLOAT +#if MICROPY_PY_BUILTINS_COMPLEX { MP_OBJ_NEW_QSTR(MP_QSTR_complex), (mp_obj_t)&mp_type_complex }, #endif { MP_OBJ_NEW_QSTR(MP_QSTR_dict), (mp_obj_t)&mp_type_dict }, @@ -150,8 +150,8 @@ const mp_obj_dict_t mp_builtin_object_dict_obj = { .map = { .all_keys_are_qstrs = 1, .table_is_fixed_array = 1, - .used = ARRAY_SIZE(mp_builtin_object_table), - .alloc = ARRAY_SIZE(mp_builtin_object_table), + .used = MP_ARRAY_SIZE(mp_builtin_object_table), + .alloc = MP_ARRAY_SIZE(mp_builtin_object_table), .table = (mp_map_elem_t*)mp_builtin_object_table, }, }; @@ -195,8 +195,8 @@ const mp_obj_dict_t mp_builtin_module_dict_obj = { .map = { .all_keys_are_qstrs = 1, .table_is_fixed_array = 1, - .used = ARRAY_SIZE(mp_builtin_module_table), - .alloc = ARRAY_SIZE(mp_builtin_module_table), + .used = MP_ARRAY_SIZE(mp_builtin_module_table), + .alloc = MP_ARRAY_SIZE(mp_builtin_module_table), .table = (mp_map_elem_t*)mp_builtin_module_table, }, }; |