Closes #23652: Merge with 3.5
This commit is contained in:
commit
78f02a5f72
|
@ -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.
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue