← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to debian/patches/hurd-broken-poll.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-07-06 16:52:42 UTC
  • mfrom: (1.2.1 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100706165242-2xv4i019r3et6c0j
Tags: 3.1.2+20100706-1ubuntu1
* Merge with Debian; remaining changes:
  - Regenerate the control file.
  - Add debian/patches/overwrite-semaphore-check for Lucid buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/hurd-broken-poll.diff
 
1
# DP: Fix build failure on hurd, working around poll() on systems
 
2
# DP: on which it returns an error on invalid FDs.
 
3
 
 
4
--- a/Modules/selectmodule.c
 
5
+++ b/Modules/selectmodule.c
 
6
@@ -1720,7 +1720,7 @@
 
7
 
 
8
 static PyMethodDef select_methods[] = {
 
9
     {"select",          select_select,  METH_VARARGS,   select_doc},
 
10
-#ifdef HAVE_POLL
 
11
+#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
 
12
     {"poll",            select_poll,    METH_NOARGS,    poll_doc},
 
13
 #endif /* HAVE_POLL */
 
14
     {0,         0},     /* sentinel */
 
15
@@ -1757,7 +1757,7 @@
 
16
     Py_INCREF(SelectError);
 
17
     PyModule_AddObject(m, "error", SelectError);
 
18
 
 
19
-#if defined(HAVE_POLL)
 
20
+#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
 
21
 #ifdef __APPLE__
 
22
     if (select_have_broken_poll()) {
 
23
         if (PyObject_DelAttrString(m, "poll") == -1) {