[Python-checkins] python/dist/src/Modules socketmodule.c,1.224,1.225

2002年6月13日 04:53:54 -0700

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv20032
Modified Files:
	socketmodule.c 
Log Message:
work around name clash with OS/2 TCPIP routine sock_init()
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -C2 -d -r1.224 -r1.225
*** socketmodule.c	7 Jun 2002 19:55:29 -0000	1.224
--- socketmodule.c	13 Jun 2002 11:53:52 -0000	1.225
***************
*** 2058,2062 ****
 /*ARGSUSED*/
 static int
! sock_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
 	PySocketSockObject *s = (PySocketSockObject *)self;
--- 2058,2062 ----
 /*ARGSUSED*/
 static int
! sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
 {
 	PySocketSockObject *s = (PySocketSockObject *)self;
***************
*** 2134,2138 ****
 	0,					/* tp_descr_set */
 	0,					/* tp_dictoffset */
! 	sock_init,				/* tp_init */
 	0,	/* set below */			/* tp_alloc */
 	sock_new,				/* tp_new */
--- 2134,2138 ----
 	0,					/* tp_descr_set */
 	0,					/* tp_dictoffset */
! 	sock_initobj,				/* tp_init */
 	0,	/* set below */			/* tp_alloc */
 	sock_new,				/* tp_new */