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>

1 files changed, 14 insertions, 6 deletions

diff --git a/py/objrange.c b/py/objrange.c
index adf4b1746..3140504b2 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -210,19 +210,27 @@ STATIC void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
+#if MICROPY_PY_BUILTINS_RANGE_BINOP
+#define RANGE_TYPE_BINOP binary_op, range_binary_op,
+#else
+#define RANGE_TYPE_BINOP
+#endif
+
+#if MICROPY_PY_BUILTINS_RANGE_ATTRS
+#define RANGE_TYPE_ATTR attr, range_attr,
+#else
+#define RANGE_TYPE_ATTR
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_range,
     MP_QSTR_range,
     MP_TYPE_FLAG_NONE,
     range_make_new,
+    RANGE_TYPE_BINOP
+    RANGE_TYPE_ATTR
     print, range_print,
     unary_op, range_unary_op,
-    #if MICROPY_PY_BUILTINS_RANGE_BINOP
-    binary_op, range_binary_op,
-    #endif
     subscr, range_subscr,
     getiter, range_getiter
-    #if MICROPY_PY_BUILTINS_RANGE_ATTRS
-    , attr, range_attr
-    #endif
     );