summaryrefslogtreecommitdiffstatshomepage
path: root/py/obj.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-10 15:11:56 -0800
committerDamien George <damien.p.george@gmail.com>2014-01-10 15:11:56 -0800
commit745ce4c2ad710251fd3a0bc944cfc783928587e3 (patch)
tree0cb68ec8acc78b63f6aa8ea06d015ee2d616d65a /py/obj.h
parentbab5cfb34f6b1ed4b16c24221479c20f5ed71c4f (diff)
parent4bee76ebca8d0507da6a957cf9e1eaf29fdcc7b1 (diff)
downloadmicropython-745ce4c2ad710251fd3a0bc944cfc783928587e3.tar.gz
micropython-745ce4c2ad710251fd3a0bc944cfc783928587e3.zip
Merge pull request #131 from chipaca/dict_fromkeys
Added dict.fromkeys.
Diffstat (limited to 'py/obj.h')
-rw-r--r--py/obj.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/py/obj.h b/py/obj.h
index 48080a0ec0..d897d906d9 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -234,6 +234,7 @@ void mp_obj_get_complex(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag);
qstr mp_obj_get_qstr(mp_obj_t arg);
mp_obj_t *mp_obj_get_array_fixed_n(mp_obj_t o, machine_int_t n);
uint mp_get_index(const mp_obj_type_t *type, machine_uint_t len, mp_obj_t index);
+mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); /* may return NULL */
// none
extern const mp_obj_type_t none_type;