summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-08-02 02:34:05 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-08-02 02:34:05 (GMT)
commit3e77677692e969fd0a0c14c7b927da6429e8e13e (patch)
tree3361da037f311a78d986a37b2d25456db8007ee5
parent1c837f4010a409f0ecb31d5dde52f882b39ae9c6 (diff)
downloadcpython-3e77677692e969fd0a0c14c7b927da6429e8e13e.zip
cpython-3e77677692e969fd0a0c14c7b927da6429e8e13e.tar.gz
cpython-3e77677692e969fd0a0c14c7b927da6429e8e13e.tar.bz2
Issue #23652: Make the select module compile against LSB headers.
Patch by Matt Frank.
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/selectmodule.c11
2 files changed, 15 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1aa2ea3..f3348c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,10 @@ Core and Builtins
Library
-------
+- Issue #23652: Make it possible to compile the select module against the
+ libc headers from the Linux Standard Base, which do not include some
+ EPOLL macros. Patch by Matt Frank.
+
- Issue #22932: Fix timezones in email.utils.formatdate.
Patch from Dmitry Shachnev.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index ffaf865..d436f52 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -2372,11 +2372,22 @@ PyInit_select(void)
PyModule_AddIntMacro(m, EPOLLONESHOT);
#endif
/* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
+
+#ifdef EPOLLRDNORM
PyModule_AddIntMacro(m, EPOLLRDNORM);
+#endif
+#ifdef EPOLLRDBAND
PyModule_AddIntMacro(m, EPOLLRDBAND);
+#endif
+#ifdef EPOLLWRNORM
PyModule_AddIntMacro(m, EPOLLWRNORM);
+#endif
+#ifdef EPOLLWRBAND
PyModule_AddIntMacro(m, EPOLLWRBAND);
+#endif
+#ifdef EPOLLMSG
PyModule_AddIntMacro(m, EPOLLMSG);
+#endif
#ifdef EPOLL_CLOEXEC
PyModule_AddIntMacro(m, EPOLL_CLOEXEC);