diff options
| author | Paul Sokolovsky | 2016-11-21 00:48:55 +0300 |
|---|---|---|
| committer | Paul Sokolovsky | 2016-11-21 00:48:55 +0300 |
| commit | 87dfc765706222d8be348f9ad78ad2c704704f53 (patch) | |
| tree | 9330b022751c5f3d00056947c18b08d10d1bf573 | |
| parent | 8f5bc3ffc0603bbc338f9a24bd7d278b72d5c9d7 (diff) | |
unix: Rename define for unix moduselect to MICROPY_PY_USELECT_POSIX.
To not conflict with recently made available globally baremetal
moduselect.
| -rw-r--r-- | unix/moduselect.c | 4 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unix/moduselect.c b/unix/moduselect.c index 4a6973c0d..3b5daa53d 100644 --- a/unix/moduselect.c +++ b/unix/moduselect.c @@ -27,7 +27,7 @@ #include "py/mpconfig.h" -#if MICROPY_PY_USELECT +#if MICROPY_PY_USELECT_POSIX #include <stdio.h> #include <errno.h> @@ -238,4 +238,4 @@ const mp_obj_module_t mp_module_uselect = { .globals = (mp_obj_dict_t*)&mp_module_select_globals, }; -#endif // MICROPY_PY_USELECT +#endif // MICROPY_PY_USELECT_POSIX diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 86e460566..01cd8814b 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -121,8 +121,8 @@ #define MICROPY_PY_UBINASCII (1) #define MICROPY_PY_UBINASCII_CRC32 (1) #define MICROPY_PY_URANDOM (1) -#ifndef MICROPY_PY_USELECT -#define MICROPY_PY_USELECT (1) +#ifndef MICROPY_PY_USELECT_POSIX +#define MICROPY_PY_USELECT_POSIX (1) #endif #define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_MACHINE (1) @@ -194,7 +194,7 @@ extern const struct _mp_obj_module_t mp_module_jni; #else #define MICROPY_PY_SOCKET_DEF #endif -#if MICROPY_PY_USELECT +#if MICROPY_PY_USELECT_POSIX #define MICROPY_PY_USELECT_DEF { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) }, #else #define MICROPY_PY_USELECT_DEF |