[Python-checkins] python/dist/src/Modules selectmodule.c, 2.73, 2.73.12.1

Mon Mar 22 15:20:35 EST 2004

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14693/Modules
Modified Files:
 Tag: release23-maint
	selectmodule.c 
Log Message:
Added check for broken poll on OSes where it exists but sets errno for
bad file descriptor. Fixes SF Bug #850981
Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.73
retrieving revision 2.73.12.1
diff -C2 -d -r2.73 -r2.73.12.1
*** selectmodule.c	11 Feb 2003 17:18:58 -0000	2.73
--- selectmodule.c	22 Mar 2004 20:20:33 -0000	2.73.12.1
***************
*** 319,323 ****
 }
 
! #ifdef HAVE_POLL
 /* 
 * poll() support
--- 319,323 ----
 }
 
! #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
 /* 
 * poll() support
***************
*** 613,617 ****
 	return (PyObject *)rv;
 }
! #endif /* HAVE_POLL */
 
 PyDoc_STRVAR(select_doc,
--- 613,617 ----
 	return (PyObject *)rv;
 }
! #endif /* HAVE_POLL && !HAVE_BROKEN_POLL */
 
 PyDoc_STRVAR(select_doc,
***************
*** 640,646 ****
 static PyMethodDef select_methods[] = {
 {"select",	select_select, METH_VARARGS, select_doc},
! #ifdef HAVE_POLL
 {"poll", select_poll, METH_VARARGS, poll_doc},
! #endif /* HAVE_POLL */
 {0, 	0},			 /* sentinel */
 };
--- 640,646 ----
 static PyMethodDef select_methods[] = {
 {"select",	select_select, METH_VARARGS, select_doc},
! #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
 {"poll", select_poll, METH_VARARGS, poll_doc},
! #endif /* HAVE_POLL && !HAVE_BROKEN_POLL */
 {0, 	0},			 /* sentinel */
 };
***************
*** 661,665 ****
 	Py_INCREF(SelectError);
 	PyModule_AddObject(m, "error", SelectError);
! #ifdef HAVE_POLL
 	poll_Type.ob_type = &PyType_Type;
 	PyModule_AddIntConstant(m, "POLLIN", POLLIN);
--- 661,665 ----
 	Py_INCREF(SelectError);
 	PyModule_AddObject(m, "error", SelectError);
! #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
 	poll_Type.ob_type = &PyType_Type;
 	PyModule_AddIntConstant(m, "POLLIN", POLLIN);
***************
*** 685,688 ****
 	PyModule_AddIntConstant(m, "POLLMSG", POLLMSG);
 #endif
! #endif /* HAVE_POLL */
 }
--- 685,688 ----
 	PyModule_AddIntConstant(m, "POLLMSG", POLLMSG);
 #endif
! #endif /* HAVE_POLL && !HAVE_BROKEN_POLL */
 }