commit b7d6ee9b75650bd0ac36e89077d5d08a3eed9e3f
author Jim Mussared <jim.mussared@gmail.com> Fri Jun 24 16:22:38 2022 +1000
committer Damien George <damien@micropython.org> Mon Sep 19 19:06:01 2022 +1000
tree 95857a2ffdb34d6179120405bd89711e078cfa85
parent 662b9761b37b054f08fe2f7c00d0fce3a418d0b0

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>

py/objslice.c

diff --git a/py/objslice.c b/py/objslice.c
index 98c0348..7baca1f 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -92,17 +92,21 @@
 STATIC MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
 #endif
 
+#if MICROPY_PY_BUILTINS_SLICE_ATTRS
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT attr, slice_attr,
+#elif MICROPY_PY_BUILTINS_SLICE_INDICES
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&slice_locals_dict,
+#else
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_slice,
     MP_QSTR_slice,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
+    SLICE_TYPE_ATTR_OR_LOCALS_DICT
     print, slice_print
-    #if MICROPY_PY_BUILTINS_SLICE_ATTRS
-    , attr, slice_attr
-    #elif MICROPY_PY_BUILTINS_SLICE_INDICES
-    , locals_dict, (mp_obj_dict_t *)&slice_locals_dict
-    #endif
     );
 
 mp_obj_t mp_obj_new_slice(mp_obj_t ostart, mp_obj_t ostop, mp_obj_t ostep) {