From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Sun, 4 Apr 2004 07:19:27 +0000 (+0000)
Subject: Backport to 2.3 to support Zope 2.7 on OS/2:
X-Git-Tag: v2.3.4c1~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a2a3b603a36c177d5eabca5d3266019c2d2d184;p=thirdparty%2FPython%2Fcpython.git

Backport to 2.3 to support Zope 2.7 on OS/2:

OS/2's TCP/IP stack supports AF_UNIX sockets, with the limitation that
the socket name must start with /socket32/.  Unlike Unix systems, this
file never exists in the file system.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 2b41af3a4f86..6430c87dbf75 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -858,7 +858,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
 		return ret;
 	}
 
-#if defined(AF_UNIX) && !defined(PYOS_OS2)
+#if defined(AF_UNIX)
 	case AF_UNIX:
 	{
 		struct sockaddr_un *a = (struct sockaddr_un *) addr;
@@ -932,7 +932,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 {
 	switch (s->sock_family) {
 
-#if defined(AF_UNIX) && !defined(PYOS_OS2)
+#if defined(AF_UNIX)
 	case AF_UNIX:
 	{
 		struct sockaddr_un* addr;
@@ -1063,7 +1063,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
 {
 	switch (s->sock_family) {
 
-#if defined(AF_UNIX) && !defined(PYOS_OS2)
+#if defined(AF_UNIX)
 	case AF_UNIX:
 	{
 		*len_ret = sizeof (struct sockaddr_un);
@@ -3541,7 +3541,7 @@ init_socket(void)
 #ifdef AF_INET6
 	PyModule_AddIntConstant(m, "AF_INET6", AF_INET6);
 #endif /* AF_INET6 */
-#if defined(AF_UNIX) && !defined(PYOS_OS2)
+#if defined(AF_UNIX)
 	PyModule_AddIntConstant(m, "AF_UNIX", AF_UNIX);
 #endif /* AF_UNIX */
 #ifdef AF_AX25