diff options
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/selectmodule.c | 4 |
3 files changed, 6 insertions, 2 deletions
@@ -45,6 +45,7 @@ Jon Anglin Heidi Annexstad Éric Araujo Alicia Arlen +Jeffrey Armstrong Jason Asbahr David Ascher Chris AtLee @@ -732,6 +732,9 @@ Tests 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. - Cross compiling needs host and build settings. configure no longer diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index e79bea30a7..4c84312a70 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -2115,7 +2115,7 @@ descriptors can be used."); static PyMethodDef select_methods[] = { {"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}, #endif /* HAVE_POLL */ #ifdef HAVE_SYS_DEVPOLL_H @@ -2165,7 +2165,7 @@ PyInit_select(void) PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF); #endif -#if defined(HAVE_POLL) +#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL) #ifdef __APPLE__ if (select_have_broken_poll()) { if (PyObject_DelAttrString(m, "poll") == -1) { |