diff Modules/socketmodule.c @ 21128:15ff504632ed legacy-trunk

Remove INET6 define. Use ENABLE_IPV6 instead.
author Martin v. Löwis <martin@v.loewis.de>
date Sun, 02 Dec 2001 10:15:37 +0000
parents c2150313d9d1
children 349d66cd874c
line wrap: on
line diff
--- a/Modules/socketmodule.c	Sun Dec 02 08:29:16 2001 +0000
+++ b/Modules/socketmodule.c	Sun Dec 02 10:15:37 2001 +0000
@@ -479,7 +479,7 @@
 #ifdef AF_UNIX
 		struct sockaddr_un un;
 #endif
-#ifdef INET6
+#ifdef ENABLE_IPV6
 		struct sockaddr_in6 in6;
 		struct sockaddr_storage storage;
 #endif
@@ -594,7 +594,7 @@
 		case AF_INET:
 			siz = 4;
 			break;
-#ifdef INET6
+#ifdef ENABLE_IPV6
 		case AF_INET6:
 			siz = 16;
 			break;
@@ -651,7 +651,7 @@
 	switch (addr_ret->sa_family) {
 	case AF_INET:
 		return 4;
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 		return 16;
 #endif
@@ -725,7 +725,7 @@
 	}
 #endif /* AF_UNIX */
 
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 	{
 		struct sockaddr_in6 *a;
@@ -830,7 +830,7 @@
 		return 1;
 	}
 
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 	{
 		struct sockaddr_in6* addr;
@@ -919,7 +919,7 @@
 		return 1;
 	}
 
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 	{
 		*len_ret = sizeof (struct sockaddr_in6);
@@ -1993,7 +1993,7 @@
 		if (alen < sizeof(struct sockaddr_in))
 			return NULL;
 		break;
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 		if (alen < sizeof(struct sockaddr_in6))
 			return NULL;
@@ -2031,7 +2031,7 @@
 				memcpy((char *) addr, &sin, sizeof(sin));
 			break;
 		    }
-#ifdef INET6
+#ifdef ENABLE_IPV6
 		case AF_INET6:
 		    {
 			struct sockaddr_in6 sin6;
@@ -2138,7 +2138,7 @@
 static PyObject *
 PySocket_gethostbyaddr(PyObject *self, PyObject *args)
 {
-#ifdef INET6
+#ifdef ENABLE_IPV6
         struct sockaddr_storage addr;
 #else
 	struct sockaddr_in addr;
@@ -2177,7 +2177,7 @@
 		ap = (char *)&((struct sockaddr_in *)sa)->sin_addr;
 		al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
 		break;
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 		ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
 		al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
@@ -2588,7 +2588,7 @@
 		}
 		break;
 	    }
-#ifdef INET6
+#ifdef ENABLE_IPV6
 	case AF_INET6:
 	    {
 		struct sockaddr_in6 *sin6;