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/objenumerate.c | |
| parent | 780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff) | |
| parent | 939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objenumerate.c')
| -rw-r--r-- | py/objenumerate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objenumerate.c b/py/objenumerate.c index 7d9ea9915..37414464d 100644 --- a/py/objenumerate.c +++ b/py/objenumerate.c @@ -27,8 +27,8 @@ #include <stdlib.h> #include <assert.h> -#include "misc.h" #include "mpconfig.h" +#include "misc.h" #include "qstr.h" #include "obj.h" #include "runtime.h" @@ -45,7 +45,7 @@ STATIC const mp_arg_t enumerate_make_new_args[] = { { MP_QSTR_iterable, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_start, MP_ARG_INT, {.u_int = 0} }, }; -#define ENUMERATE_MAKE_NEW_NUM_ARGS ARRAY_SIZE(enumerate_make_new_args) +#define ENUMERATE_MAKE_NEW_NUM_ARGS MP_ARRAY_SIZE(enumerate_make_new_args) STATIC mp_obj_t enumerate_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { #if MICROPY_CPYTHON_COMPAT |