[Python-checkins] cpython (3.2): Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL.

Sat Jan 19 12:40:33 CET 2013

http://hg.python.org/cpython/rev/101e821e5e70
changeset: 81592:101e821e5e70
branch: 3.2
parent: 81587:974ace29ee2d
user: Charles-François Natali <cf.natali at gmail.com>
date: Sat Jan 19 12:19:10 2013 +0100
summary:
 Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL.
Patch by Jeffrey Armstrong.
files:
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 Modules/selectmodule.c | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -41,6 +41,7 @@
 Heidi Annexstad
 Éric Araujo
 Alicia Arlen
+Jeffrey Armstrong
 Jason Asbahr
 David Ascher
 Chris AtLee
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -849,6 +849,9 @@
 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
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1743,7 +1743,7 @@
 
 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 @@
 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) {
-- 
Repository URL: http://hg.python.org/cpython
