mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 22:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #23652: Merge with 3.4

Browse source
This commit is contained in:
Zachary Ware 2015-08-01 21:38:04 -05:00
commit 1824544d82
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -13,6 +13,10 @@ Core and Builtins
Library 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. - Issue #22932: Fix timezones in email.utils.formatdate.
Patch from Dmitry Shachnev. Patch from Dmitry Shachnev.

11
Modules/selectmodule.c
View file

@ -2479,11 +2479,22 @@ PyInit_select(void)
PyModule_AddIntMacro(m, EPOLLONESHOT); PyModule_AddIntMacro(m, EPOLLONESHOT);
#endif #endif
/* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */ /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
#ifdef EPOLLRDNORM
PyModule_AddIntMacro(m, EPOLLRDNORM); PyModule_AddIntMacro(m, EPOLLRDNORM);
#endif
#ifdef EPOLLRDBAND
PyModule_AddIntMacro(m, EPOLLRDBAND); PyModule_AddIntMacro(m, EPOLLRDBAND);
#endif
#ifdef EPOLLWRNORM
PyModule_AddIntMacro(m, EPOLLWRNORM); PyModule_AddIntMacro(m, EPOLLWRNORM);
#endif
#ifdef EPOLLWRBAND
PyModule_AddIntMacro(m, EPOLLWRBAND); PyModule_AddIntMacro(m, EPOLLWRBAND);
#endif
#ifdef EPOLLMSG
PyModule_AddIntMacro(m, EPOLLMSG); PyModule_AddIntMacro(m, EPOLLMSG);
#endif
#ifdef EPOLL_CLOEXEC #ifdef EPOLL_CLOEXEC
PyModule_AddIntMacro(m, EPOLL_CLOEXEC); PyModule_AddIntMacro(m, EPOLL_CLOEXEC);