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

Patch by Jeffrey Armstrong.

diff --git a/Misc/ACKS b/Misc/ACKS
index 6c1ce6822b0c01b31d9565952bfa6536fe13542b..538f2c0106cadbb348f714cbafe0deb5ce7413b2 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -35,6 +35,7 @@ Oliver Andrich
 Ross Andrus
 Heidi Annexstad
 Éric Araujo
+Jeffrey Armstrong
 Jason Asbahr
 David Ascher
 Chris AtLee

diff --git a/Misc/NEWS b/Misc/NEWS
index f7491d1843e8a98a5f65c232e8fd30e1f39bcb84..11343e60da716bec665835bd4e824c57f56ee759 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -700,6 +700,9 @@ Tests
 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 #15923: fix a mistake in asdl_c.py that resulted in a TypeError after

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 61e101eb7dd595a67547da50630d506cbad2a79b..650d9fe3fba04a11ae23dad4ca2d271c9e386731 100644 (file)
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1737,7 +1737,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 */
     {0,         0},     /* sentinel */
@@ -1769,7 +1769,7 @@ initselect(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) {