summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Noller <jnoller@gmail.com>2009-03-31 14:35:13 (GMT)
committerJesse Noller <jnoller@gmail.com>2009-03-31 14:35:13 (GMT)
commit5b19e62b88e095c4da17f3ffbcf9096e0d827245 (patch)
treea7a32c671e05aa527f6742582d1d478531eff76b
parentcfb3d33c24dd98d73187932be2c9059f19baa412 (diff)
downloadcpython-5b19e62b88e095c4da17f3ffbcf9096e0d827245.zip
cpython-5b19e62b88e095c4da17f3ffbcf9096e0d827245.tar.gz
cpython-5b19e62b88e095c4da17f3ffbcf9096e0d827245.tar.bz2
Merged revisions 68787 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68787 | jesse.noller | 2009-01-19 18:16:38 -0600 (Mon, 19 Jan 2009) | 1 line issue 5002: fix windows warning that I intro'ed with r68768 ........
-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;