From: Jesse Noller <jnoller@gmail.com>
Date: Tue, 31 Mar 2009 14:35:13 +0000 (+0000)
Subject: Merged revisions 68787 via svnmerge from
X-Git-Tag: v2.6.2c1~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b19e62b88e095c4da17f3ffbcf9096e0d827245;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Modules/_multiprocessing/pipe_connection.c b/Modules/_multiprocessing/pipe_connection.c
index ad16fc89d31e..27e79dda7d4a 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;