From 87dfc765706222d8be348f9ad78ad2c704704f53 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Mon, 21 Nov 2016 00:48:55 +0300
Subject: [PATCH] unix: Rename define for unix moduselect to
MICROPY_PY_USELECT_POSIX.
To not conflict with recently made available globally baremetal
moduselect.
---
unix/moduselect.c | 4 ++--
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
--
GitLab