diff options
| author | Charles-François Natali <cf.natali@gmail.com> | 2013-01-19 11:19:10 (GMT) |
|---|---|---|
| committer | Charles-François Natali <cf.natali@gmail.com> | 2013-01-19 11:19:10 (GMT) |
| commit | 986a56cefefc9200a0bbebca02bc93f24e4a3eaa (patch) | |
| tree | 5ea83590977abfcd17c2b03f27b7b6c043063522 | |
| parent | 441d30fac7f4037e4a79e4ada873de3b6f6e5a26 (diff) | |
| download | cpython-986a56cefefc9200a0bbebca02bc93f24e4a3eaa.zip cpython-986a56cefefc9200a0bbebca02bc93f24e4a3eaa.tar.gz cpython-986a56cefefc9200a0bbebca02bc93f24e4a3eaa.tar.bz2 | |
Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL.
Patch by Jeffrey Armstrong.
| -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
@@ -41,6 +41,7 @@ Jon Anglin Heidi Annexstad Éric Araujo Alicia Arlen +Jeffrey Armstrong Jason Asbahr David Ascher Chris AtLee @@ -849,6 +849,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 #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 3f846d8..7863aaa 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1743,7 +1743,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 */ @@ -1788,7 +1788,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) { |