diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-08-02 02:38:04 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-08-02 02:38:04 (GMT) |
| commit | 1824544d828a25775d221f87caf325e12ab41a06 (patch) | |
| tree | d79f50ec4f61cddaa655dbf6cacfb41ac0a0705b | |
| parent | dba51b83783f256ce178b3abae58888c66d8b5ce (diff) | |
| parent | 3e77677692e969fd0a0c14c7b927da6429e8e13e (diff) | |
| download | cpython-1824544d828a25775d221f87caf325e12ab41a06.zip cpython-1824544d828a25775d221f87caf325e12ab41a06.tar.gz cpython-1824544d828a25775d221f87caf325e12ab41a06.tar.bz2 | |
Issue #23652: Merge with 3.4
| -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 590aeca..44ff3dd 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); |