Skip to content

Commit 87dfc76

Browse files
committed
unix: Rename define for unix moduselect to MICROPY_PY_USELECT_POSIX.
To not conflict with recently made available globally baremetal moduselect.
1 parent 8f5bc3f commit 87dfc76

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

unix/moduselect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "py/mpconfig.h"
2929

30-
#if MICROPY_PY_USELECT
30+
#if MICROPY_PY_USELECT_POSIX
3131

3232
#include <stdio.h>
3333
#include <errno.h>
@@ -238,4 +238,4 @@ const mp_obj_module_t mp_module_uselect = {
238238
.globals = (mp_obj_dict_t*)&mp_module_select_globals,
239239
};
240240

241-
#endif // MICROPY_PY_USELECT
241+
#endif // MICROPY_PY_USELECT_POSIX

unix/mpconfigport.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@
121121
#define MICROPY_PY_UBINASCII (1)
122122
#define MICROPY_PY_UBINASCII_CRC32 (1)
123123
#define MICROPY_PY_URANDOM (1)
124-
#ifndef MICROPY_PY_USELECT
125-
#define MICROPY_PY_USELECT (1)
124+
#ifndef MICROPY_PY_USELECT_POSIX
125+
#define MICROPY_PY_USELECT_POSIX (1)
126126
#endif
127127
#define MICROPY_PY_WEBSOCKET (1)
128128
#define MICROPY_PY_MACHINE (1)
@@ -194,7 +194,7 @@ extern const struct _mp_obj_module_t mp_module_jni;
194194
#else
195195
#define MICROPY_PY_SOCKET_DEF
196196
#endif
197-
#if MICROPY_PY_USELECT
197+
#if MICROPY_PY_USELECT_POSIX
198198
#define MICROPY_PY_USELECT_DEF { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
199199
#else
200200
#define MICROPY_PY_USELECT_DEF

0 commit comments

Comments
 (0)