mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL.

Browse source 
Patch by Jeffrey Armstrong.
This commit is contained in:
Charles-François Natali 2013-01-19 12:15:56 +01:00
parent 74f49ab28b
commit a41cf29c0b
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -35,6 +35,7 @@ Oliver Andrich
Ross Andrus Ross Andrus
Heidi Annexstad Heidi Annexstad
Éric Araujo Éric Araujo
Jeffrey Armstrong
Jason Asbahr Jason Asbahr
David Ascher David Ascher
Chris AtLee Chris AtLee

3
Misc/NEWS
View file

@ -700,6 +700,9 @@ Tests
Build Build
----- -----
- Issue #16953: Fix socket module compilation on platforms with
HAVE_BROKEN_POLL. Patch by Jeffrey Armstrong.
- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host. - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after - Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after

4
Modules/selectmodule.c
View file

@ -1737,7 +1737,7 @@ descriptors can be used.");
static PyMethodDef select_methods[] = { static PyMethodDef select_methods[] = {
{"select", select_select, METH_VARARGS, select_doc}, {"select", select_select, METH_VARARGS, select_doc},
#ifdef HAVE_POLL #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
{"poll", select_poll, METH_NOARGS, poll_doc}, {"poll", select_poll, METH_NOARGS, poll_doc},
#endif /* HAVE_POLL */ #endif /* HAVE_POLL */
{0, 0}, /* sentinel */ {0, 0}, /* sentinel */
@ -1769,7 +1769,7 @@ initselect(void)
PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF); PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF);
#endif #endif
#if defined(HAVE_POLL) #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
#ifdef __APPLE__ #ifdef __APPLE__
if (select_have_broken_poll()) { if (select_have_broken_poll()) {
if (PyObject_DelAttrString(m, "poll") == -1) { if (PyObject_DelAttrString(m, "poll") == -1) {