1 files changed, 20 insertions, 17 deletions
diff --git a/py/objrange.c b/py/objrange.c
index 549602189..adf4b1746 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -50,12 +50,14 @@ STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
     }
 }
 
-STATIC const mp_obj_type_t mp_type_range_it = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = range_it_iternext,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_range_it,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, range_it_iternext
+    );
 
 STATIC mp_obj_t mp_obj_new_range_iterator(mp_int_t cur, mp_int_t stop, mp_int_t step, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_range_it_t) <= sizeof(mp_obj_iter_buf_t));
@@ -208,18 +210,19 @@ STATIC void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
-const mp_obj_type_t mp_type_range = {
-    { &mp_type_type },
-    .name = MP_QSTR_range,
-    .print = range_print,
-    .make_new = range_make_new,
-    .unary_op = range_unary_op,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_range,
+    MP_QSTR_range,
+    MP_TYPE_FLAG_NONE,
+    range_make_new,
+    print, range_print,
+    unary_op, range_unary_op,
     #if MICROPY_PY_BUILTINS_RANGE_BINOP
-    .binary_op = range_binary_op,
+    binary_op, range_binary_op,
     #endif
-    .subscr = range_subscr,
-    .getiter = range_getiter,
+    subscr, range_subscr,
+    getiter, range_getiter
     #if MICROPY_PY_BUILTINS_RANGE_ATTRS
-    .attr = range_attr,
+    , attr, range_attr
     #endif
-};
+    );