diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-20 01:26:25 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-20 01:26:25 +0100 |
commit | 53775026e75d6a1c2611eb71ccfa118d1d82bddb (patch) | |
tree | 3b6e098d029e6c0fbde7eed34da1662e95aeadba /unix/modffi.c | |
parent | fd6925b4b90761a535bd7b14be019b7870491b2f (diff) | |
parent | efc36f0cea84931ac055979d52e261afc912c3dd (diff) | |
download | micropython-53775026e75d6a1c2611eb71ccfa118d1d82bddb.tar.gz micropython-53775026e75d6a1c2611eb71ccfa118d1d82bddb.zip |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'unix/modffi.c')
-rw-r--r-- | unix/modffi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/modffi.c b/unix/modffi.c index bdaa3b2b43..83bc2c5454 100644 --- a/unix/modffi.c +++ b/unix/modffi.c @@ -141,7 +141,7 @@ STATIC mp_obj_t ffimod_func(uint n_args, const mp_obj_t *args) { mp_obj_t iterable = mp_getiter(args[3]); mp_obj_t item; int i = 0; - while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) { + while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { o->params[i++] = get_ffi_type(item); } @@ -178,7 +178,7 @@ STATIC mp_obj_t mod_ffi_callback(mp_obj_t rettype_in, mp_obj_t func_in, mp_obj_t mp_obj_t iterable = mp_getiter(paramtypes_in); mp_obj_t item; int i = 0; - while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) { + while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { o->params[i++] = get_ffi_type(item); } |