From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 2 Aug 2015 02:30:11 +0000 (-0500)
Subject: Issue #23652: Make the select module compile against LSB headers.
X-Git-Tag: v2.7.11rc1~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=977be3e7b51359a3900984cead5a703c57009260;p=thirdparty%2FPython%2Fcpython.git

Issue #23652: Make the select module compile against LSB headers.
Initial patch by Matt Frank.
---

diff --git a/Misc/ACKS b/Misc/ACKS
index 9cfd8ec7826a..21f4cca1476c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -429,6 +429,7 @@ Doug Fort
 Chris Foster
 John Fouhy
 Andrew Francis
+Matt Frank
 Stefan Franke
 Martin Franklin
 Kent Frazier
diff --git a/Misc/NEWS b/Misc/NEWS
index bc742a881d0d..54c2d8cda649 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,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.  Initial patch by Matt Frank.
+
 - Issue #15138: Speed up base64.urlsafe_b64{en,de}code considerably.
 
 - Issue #23319: Fix ctypes.BigEndianStructure, swap correctly bytes. Patch
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 2707b059f526..6ea308adb018 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1874,11 +1874,21 @@ initselect(void)
     PyModule_AddIntConstant(m, "EPOLLONESHOT", EPOLLONESHOT);
 #endif
     /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
+#ifdef EPOLLRDNORM
     PyModule_AddIntConstant(m, "EPOLLRDNORM", EPOLLRDNORM);
+#endif
+#ifdef EPOLLRDBAND
     PyModule_AddIntConstant(m, "EPOLLRDBAND", EPOLLRDBAND);
+#endif
+#ifdef EPOLLWRNORM
     PyModule_AddIntConstant(m, "EPOLLWRNORM", EPOLLWRNORM);
+#endif
+#ifdef EPOLLWRBAND
     PyModule_AddIntConstant(m, "EPOLLWRBAND", EPOLLWRBAND);
+#endif
+#ifdef EPOLLMSG
     PyModule_AddIntConstant(m, "EPOLLMSG", EPOLLMSG);
+#endif
 #endif /* HAVE_EPOLL */
 
 #ifdef HAVE_KQUEUE