[Python-checkins] r70814 - in python/branches/release26-maint: Modules/_multiprocessing/pipe_connection.c

[jesse.noller]

Author: jesse.noller
Date: Tue Mar 31 16:35:13 2009
New Revision: 70814

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Modules/_multiprocessing/pipe_connection.c

Modified: python/branches/release26-maint/Modules/_multiprocessing/pipe_connection.c
==============================================================================
--- python/branches/release26-maint/Modules/_multiprocessing/pipe_connection.c	(original)
+++ python/branches/release26-maint/Modules/_multiprocessing/pipe_connection.c	Tue Mar 31 16:35:13 2009
@@ -83,10 +83,8 @@
  * 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;