traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Patch by Jeffrey Armstrong.
This commit is contained in:
Charles-François Natali 2013-01-19 12:19:10 +01:00
parent 441d30fac7
commit 986a56cefe
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -41,6 +41,7 @@ Jon Anglin
Heidi Annexstad Heidi Annexstad
Éric Araujo Éric Araujo
Alicia Arlen Alicia Arlen
Jeffrey Armstrong
Jason Asbahr Jason Asbahr
David Ascher David Ascher
Chris AtLee Chris AtLee

3
Misc/NEWS
View File

@ -849,6 +849,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 #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

4
Modules/selectmodule.c
View File

@ -1743,7 +1743,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 */
@ -1788,7 +1788,7 @@ PyInit_select(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) {