djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Rename define for unix moduselect to MICROPY_PY_USELECT_POSIX.

Browse Source 
To not conflict with recently made available globally baremetal
moduselect.
This commit is contained in:
Paul Sokolovsky 2016-11-21 00:48:55 +03:00
parent 8f5bc3ffc0
commit 87dfc76570
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unix/moduselect.c
View File

@ -27,7 +27,7 @@
#include "py/mpconfig.h" #include "py/mpconfig.h"
#if MICROPY_PY_USELECT #if MICROPY_PY_USELECT_POSIX
#include <stdio.h> #include <stdio.h>
#include <errno.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, .globals = (mp_obj_dict_t*)&mp_module_select_globals,
}; };
#endif // MICROPY_PY_USELECT #endif // MICROPY_PY_USELECT_POSIX

6
unix/mpconfigport.h
View File

@ -121,8 +121,8 @@
#define MICROPY_PY_UBINASCII (1) #define MICROPY_PY_UBINASCII (1)
#define MICROPY_PY_UBINASCII_CRC32 (1) #define MICROPY_PY_UBINASCII_CRC32 (1)
#define MICROPY_PY_URANDOM (1) #define MICROPY_PY_URANDOM (1)
#ifndef MICROPY_PY_USELECT #ifndef MICROPY_PY_USELECT_POSIX
#define MICROPY_PY_USELECT (1) #define MICROPY_PY_USELECT_POSIX (1)
#endif #endif
#define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_WEBSOCKET (1)
#define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE (1)
@ -194,7 +194,7 @@ extern const struct _mp_obj_module_t mp_module_jni;
#else #else
#define MICROPY_PY_SOCKET_DEF #define MICROPY_PY_SOCKET_DEF
#endif #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) }, #define MICROPY_PY_USELECT_DEF { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
#else #else
#define MICROPY_PY_USELECT_DEF #define MICROPY_PY_USELECT_DEF