[Python-checkins] cpython (3.4): Issue #23652: Make the select module compile against LSB headers.

Sun Aug 2 04:39:55 CEST 2015

https://hg.python.org/cpython/rev/c18a18b65a49
changeset: 97194:c18a18b65a49
branch: 3.4
parent: 97189:82198ae039cd
user: Zachary Ware <zachary.ware at gmail.com>
date: Sat Aug 01 21:34:05 2015 -0500
summary:
 Issue #23652: Make the select module compile against LSB headers.
Patch by Matt Frank.
files:
 Misc/NEWS | 4 ++++
 Modules/selectmodule.c | 11 +++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,10 @@
 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
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -2372,11 +2372,22 @@
 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);
-- 
Repository URL: https://hg.python.org/cpython
