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

[charles-francois.natali]

http://hg.python.org/cpython/rev/f04c97bbb241
changeset:   81593:f04c97bbb241
branch:      3.3
parent:      81588:8f10c9eae183
parent:      81592:101e821e5e70
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Sat Jan 19 12:21:26 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
@@ -45,6 +45,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
@@ -517,6 +517,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.
 
 - Cross compiling needs host and build settings. configure no longer
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -2098,7 +2098,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 */
 #ifdef HAVE_SYS_DEVPOLL_H
@@ -2148,7 +2148,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