From 7aec4a2e2cf6b6af71585894304216b2d3477200 Mon Sep 17 00:00:00 2001
From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Thu, 13 Jun 2002 11:53:52 +0000
Subject: [PATCH] work around name clash with OS/2 TCPIP routine sock_init()

---
 Modules/socketmodule.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e2d499a28ff..ff67c3dac81 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 */