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/runtime.c | |
| parent | 780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff) | |
| parent | 939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff) | |
| download | micropython-e973acde81462de0c205f27db2642a08022fb3a8.tar.gz micropython-e973acde81462de0c205f27db2642a08022fb3a8.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/py/runtime.c b/py/runtime.c index d57bb686d1..b539984c0b 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -426,6 +426,7 @@ mp_obj_t mp_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { } else { return res; } +#if MICROPY_PY_BUILTINS_COMPLEX } else if (MP_OBJ_IS_TYPE(rhs, &mp_type_complex)) { mp_obj_t res = mp_obj_complex_binary_op(op, lhs_val, 0, rhs); if (res == MP_OBJ_NULL) { @@ -434,6 +435,7 @@ mp_obj_t mp_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { return res; } #endif +#endif } } |