From 3e77677692e969fd0a0c14c7b927da6429e8e13e Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 1 Aug 2015 21:34:05 -0500 Subject: [PATCH] Issue #23652: Make the select module compile against LSB headers. Patch by Matt Frank. --- Misc/NEWS | 4 ++++ Modules/selectmodule.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 1aa2ea3e96c..f3348c14b10 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 ffaf865df2b..d436f52917d 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);