summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Noller <jnoller@gmail.com>2009-01-20 00:23:01 (GMT)
committerJesse Noller <jnoller@gmail.com>2009-01-20 00:23:01 (GMT)
commit7edf1298c46642adbec42e0b539fa058528166fd (patch)
tree6bb98235b968f2673921cd2f4b99b37da21ff633
parent4401f348c84bc7ab3ea93902e32a9d507622e50e (diff)
downloadcpython-7edf1298c46642adbec42e0b539fa058528166fd.zip
cpython-7edf1298c46642adbec42e0b539fa058528166fd.tar.gz
cpython-7edf1298c46642adbec42e0b539fa058528166fd.tar.bz2
merge r68787 to py3k
-rw-r--r--Modules/_multiprocessing/pipe_connection.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/_multiprocessing/pipe_connection.c b/Modules/_multiprocessing/pipe_connection.c
index ad16fc8..27e79dd 100644
--- a/Modules/_multiprocessing/pipe_connection.c
+++ b/Modules/_multiprocessing/pipe_connection.c
@@ -83,10 +83,8 @@ conn_recv_string(ConnectionObject *conn, char *buffer,
* Check whether any data is available for reading
*/
-#define conn_poll(conn, timeout) conn_poll_save(conn, timeout, _save)
-
static int
-conn_poll_save(ConnectionObject *conn, double timeout, PyThreadState *_save)
+conn_poll(ConnectionObject *conn, double timeout, PyThreadState *_save)
{
DWORD bytes, deadline, delay;
int difference, res;