diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-01 13:32:54 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-01 13:32:54 +0100 |
| commit | fb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9 (patch) | |
| tree | 9160abef8ff03cba6ba2d1d5664f5fb706917355 /py/objint.c | |
| parent | c60a261ef03f906ae1973f93c63169a5236f0b1f (diff) | |
| download | micropython-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/objint.c')
| -rw-r--r-- | py/objint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/objint.c b/py/objint.c index f631d698f3..74b7564550 100644 --- a/py/objint.c +++ b/py/objint.c @@ -41,7 +41,7 @@ #include "runtime0.h" #include "runtime.h" -#if MICROPY_ENABLE_FLOAT +#if MICROPY_PY_BUILTINS_FLOAT #include <math.h> #endif @@ -62,7 +62,7 @@ STATIC mp_obj_t mp_obj_int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, co uint l; const char *s = mp_obj_str_get_data(args[0], &l); return mp_parse_num_integer(s, l, 0); -#if MICROPY_ENABLE_FLOAT +#if MICROPY_PY_BUILTINS_FLOAT } else if (MP_OBJ_IS_TYPE(args[0], &mp_type_float)) { return MP_OBJ_NEW_SMALL_INT((machine_int_t)(MICROPY_FLOAT_C_FUN(trunc)(mp_obj_float_get(args[0])))); #endif @@ -267,7 +267,7 @@ machine_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) { return MP_OBJ_SMALL_INT_VALUE(self_in); } -#if MICROPY_ENABLE_FLOAT +#if MICROPY_PY_BUILTINS_FLOAT mp_float_t mp_obj_int_as_float(mp_obj_t self_in) { return MP_OBJ_SMALL_INT_VALUE(self_in); } |