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/objobject.c | |
| parent | 662b9761b37b054f08fe2f7c00d0fce3a418d0b0 (diff) | |
| download | micropython-b7d6ee9b75650bd0ac36e89077d5d08a3eed9e3f.tar.gz micropython-b7d6ee9b75650bd0ac36e89077d5d08a3eed9e3f.zip | |
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/objobject.c')
| -rw-r--r-- | py/objobject.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/py/objobject.c b/py/objobject.c index 617b40fbbf..868a85b32a 100644 --- a/py/objobject.c +++ b/py/objobject.c @@ -111,12 +111,16 @@ STATIC const mp_rom_map_elem_t object_locals_dict_table[] = { STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table); #endif +#if MICROPY_CPYTHON_COMPAT +#define OBJECT_TYPE_LOCALS_DICT , locals_dict, (mp_obj_dict_t *)&object_locals_dict +#else +#define OBJECT_TYPE_LOCALS_DICT +#endif + MP_DEFINE_CONST_OBJ_TYPE( mp_type_object, MP_QSTR_object, MP_TYPE_FLAG_NONE, object_make_new - #if MICROPY_CPYTHON_COMPAT - , locals_dict, (mp_obj_dict_t *)&object_locals_dict - #endif + OBJECT_TYPE_LOCALS_DICT ); |