diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:39:03 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:39:03 +0000 |
| commit | 4899ff9470734f0593bbe1f5272bc3d23facf7f7 (patch) | |
| tree | 929b1674e445726b50e3ff2acc1e5706e9b8f5ea /py/objcomplex.c | |
| parent | 7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9 (diff) | |
| parent | 36c4499d36a36ab3e1a68545e613bce61fb15f3c (diff) | |
| download | micropython-4899ff9470734f0593bbe1f5272bc3d23facf7f7.tar.gz micropython-4899ff9470734f0593bbe1f5272bc3d23facf7f7.zip | |
Merge branch 'str-repr' of github.com:pfalcon/micropython into pfalcon-str-repr
Conflicts:
tests/basics/tests/exception1.py
Diffstat (limited to 'py/objcomplex.c')
| -rw-r--r-- | py/objcomplex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objcomplex.c b/py/objcomplex.c index 1036bae420..bd103bbfab 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -21,7 +21,7 @@ typedef struct _mp_obj_complex_t { mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag); -void complex_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in) { +void complex_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_complex_t *o = o_in; if (o->real == 0) { print(env, "%.8gj", o->imag); |