]> granicus.if.org Git - python/commitdiff
Merged revisions 68787 via svnmerge from
authorJesse Noller <jnoller@gmail.com>
Tue, 31 Mar 2009 14:35:13 +0000 (14:35 +0000)
committerJesse Noller <jnoller@gmail.com>
Tue, 31 Mar 2009 14:35:13 +0000 (14:35 +0000)
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
........

Modules/_multiprocessing/pipe_connection.c

index ad16fc89d31ec30a2f269656790de158d209b676..27e79dda7d4a11823e8f56b93970f0a15cf9738c 100644 (file)
@@ -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;