summaryrefslogtreecommitdiffstatshomepage
path: root/py/objfun.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-06-01 13:32:54 +0100
committerDamien George <damien.p.george@gmail.com>2014-06-01 13:32:54 +0100
commitfb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9 (patch)
tree9160abef8ff03cba6ba2d1d5664f5fb706917355 /py/objfun.c
parentc60a261ef03f906ae1973f93c63169a5236f0b1f (diff)
downloadmicropython-fb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9.tar.gz
micropython-fb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9.zip
Rename bultins config variables to MICROPY_PY_BUILTINS_*.
This renames: MICROPY_PY_FROZENSET -> MICROPY_PY_BUILTINS_FROZENSET MICROPY_PY_PROPERTY -> MICROPY_PY_BUILTINS_PROPERTY MICROPY_PY_SLICE -> MICROPY_PY_BUILTINS_SLICE MICROPY_ENABLE_FLOAT -> MICROPY_PY_BUILTINS_FLOAT See issue #35 for discussion.
Diffstat (limited to 'py/objfun.c')
-rw-r--r--py/objfun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objfun.c b/py/objfun.c
index 8ee5365d5d..77d57821b9 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -469,7 +469,7 @@ STATIC machine_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
} else {
mp_obj_type_t *type = mp_obj_get_type(obj);
if (0) {
-#if MICROPY_ENABLE_FLOAT
+#if MICROPY_PY_BUILTINS_FLOAT
} else if (type == &mp_type_float) {
// convert float to int (could also pass in float registers)
return (machine_int_t)mp_obj_float_get(obj);