diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-08-01 21:38:53 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-08-01 21:38:53 -0500 |
| commit | 78f02a5f725aa3e5b8568d1b1301b2e15790f778 (patch) | |
| tree | cd7d7bf0832762b03ec4b344d7e468ab9c76dfd1 | |
| parent | 8efb76fb396eb68b1e8f97971599b8f9a4379f6a (diff) | |
| parent | 1824544d828a25775d221f87caf325e12ab41a06 (diff) | |
| download | cpython-git-78f02a5f725aa3e5b8568d1b1301b2e15790f778.tar.gz | |
Closes #23652: Merge with 3.5
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/selectmodule.c | 11 |
2 files changed, 15 insertions, 0 deletions
@@ -13,6 +13,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 590aeca31b..44ff3dd18b 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -2479,11 +2479,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); |