diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2022-06-24 16:22:38 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-09-19 19:06:01 +1000 |
| commit | b7d6ee9b75650bd0ac36e89077d5d08a3eed9e3f (patch) | |
| tree | 95857a2ffdb34d6179120405bd89711e078cfa85 /py/objarray.c | |
| parent | 662b9761b37b054f08fe2f7c00d0fce3a418d0b0 (diff) | |
all: Fix #if inside MP_DEFINE_CONST_OBJ_TYPE for msvc.
Changes:
MP_DEFINE_CONST_OBJ_TYPE(
...
#if FOO
...
#endif
...
);
to:
MP_DEFINE_CONST_OBJ_TYPE(
...
FOO_TYPE_ATTR
...
);
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Diffstat (limited to 'py/objarray.c')
| -rw-r--r-- | py/objarray.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/py/objarray.c b/py/objarray.c index d93cce29e..8d0fe7f58 100644 --- a/py/objarray.c +++ b/py/objarray.c @@ -603,6 +603,18 @@ MP_DEFINE_CONST_OBJ_TYPE( #endif #if MICROPY_PY_BUILTINS_MEMORYVIEW +#if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE +#define MEMORYVIEW_TYPE_ATTR attr, memoryview_attr, +#else +#define MEMORYVIEW_TYPE_ATTR +#endif + +#if MICROPY_PY_BUILTINS_BYTES_HEX +#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict, +#else +#define MEMORYVIEW_TYPE_LOCALS_DICT +#endif + MP_DEFINE_CONST_OBJ_TYPE( mp_type_memoryview, MP_QSTR_memoryview, @@ -611,16 +623,12 @@ MP_DEFINE_CONST_OBJ_TYPE( getiter, array_iterator_new, unary_op, array_unary_op, binary_op, array_binary_op, - #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE - attr, memoryview_attr, - #endif - #if MICROPY_PY_BUILTINS_BYTES_HEX - locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict, - #endif - .subscr = array_subscr, - .buffer = array_get_buffer, + MEMORYVIEW_TYPE_LOCALS_DICT + MEMORYVIEW_TYPE_ATTR + subscr, array_subscr, + buffer, array_get_buffer ); -#endif +#endif // MICROPY_PY_BUILTINS_MEMORYVIEW /* unused size_t mp_obj_array_len(mp_obj_t self_in) { |