summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew MacIntyre <andymac@bullseye.apana.org.au>2002-06-13 11:53:52 (GMT)
committerAndrew MacIntyre <andymac@bullseye.apana.org.au>2002-06-13 11:53:52 (GMT)
commit7aec4a2e2cf6b6af71585894304216b2d3477200 (patch)
treed51ea859e874332fa57d1299cfaa73e3243c4227
parent3fcd45230f37f3debb465e423b42c89d0af6e5f0 (diff)
downloadcpython-7aec4a2e2cf6b6af71585894304216b2d3477200.zip
cpython-7aec4a2e2cf6b6af71585894304216b2d3477200.tar.gz
cpython-7aec4a2e2cf6b6af71585894304216b2d3477200.tar.bz2
work around name clash with OS/2 TCPIP routine sock_init()
-rw-r--r--Modules/socketmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e2d499a..ff67c3d 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2057,7 +2057,7 @@ sock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
/*ARGSUSED*/
static int
-sock_init(PyObject *self, PyObject *args, PyObject *kwds)
+sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
{
PySocketSockObject *s = (PySocketSockObject *)self;
SOCKET_T fd;
@@ -2133,7 +2133,7 @@ static PyTypeObject sock_type = {
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
- sock_init, /* tp_init */
+ sock_initobj, /* tp_init */
0, /* set below */ /* tp_alloc */
sock_new, /* tp_new */
0, /* set below */ /* tp_free */