Kaydet (Commit) c07fcbb6 authored tarafından Charles-François Natali's avatar Charles-François Natali

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

Patch by Jeffrey Armstrong.
...@@ -45,6 +45,7 @@ Jon Anglin ...@@ -45,6 +45,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
......
...@@ -732,6 +732,9 @@ Tests ...@@ -732,6 +732,9 @@ Tests
Build Build
----- -----
- Issue #16953: Fix socket module compilation on platforms with
HAVE_BROKEN_POLL. Patch by Jeffrey Armstrong.
- Issue #16320: Remove redundant Makefile dependencies for strings and bytes. - Issue #16320: Remove redundant Makefile dependencies for strings and bytes.
- Cross compiling needs host and build settings. configure no longer - Cross compiling needs host and build settings. configure no longer
......
...@@ -2115,7 +2115,7 @@ descriptors can be used."); ...@@ -2115,7 +2115,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 */
#ifdef HAVE_SYS_DEVPOLL_H #ifdef HAVE_SYS_DEVPOLL_H
...@@ -2165,7 +2165,7 @@ PyInit_select(void) ...@@ -2165,7 +2165,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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment