diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:58:39 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:58:39 +0000 |
| commit | 5573f9f150d513ed3f996722e2b57b58cfb24f3b (patch) | |
| tree | 44a46d84515c9c8943ab20aa89fce0acce0fa5a5 /py/obj.h | |
| parent | 4899ff9470734f0593bbe1f5272bc3d23facf7f7 (diff) | |
| parent | 3e4ed25138b7ffc295843dfc11e44bccfb22ab9c (diff) | |
| download | micropython-5573f9f150d513ed3f996722e2b57b58cfb24f3b.tar.gz micropython-5573f9f150d513ed3f996722e2b57b58cfb24f3b.zip | |
Merge branch 'str2int' of github.com:xyb/micropython into xyb-str2int
Conflicts:
py/objint.c
unix-cpy/Makefile
unix/Makefile
Diffstat (limited to 'py/obj.h')
| -rw-r--r-- | py/obj.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -243,6 +243,7 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2); bool mp_obj_less(mp_obj_t o1, mp_obj_t o2); machine_int_t mp_obj_get_int(mp_obj_t arg); +machine_int_t mp_obj_parse_int(mp_obj_t arg, mp_obj_t base_arg); #if MICROPY_ENABLE_FLOAT mp_float_t mp_obj_get_float(mp_obj_t self_in); void mp_obj_get_complex(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag); |