From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 2 Jun 2004 12:36:49 +0000 (+0000)
Subject: Patch #924294: Do not check for AF_INET6 if it is not defined.
X-Git-Tag: v2.3.5c1~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e6014f09cf0a6088d958cc169d92cce77b5512f;p=thirdparty%2FPython%2Fcpython.git

Patch #924294: Do not check for AF_INET6 if it is not defined.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 62be689ff76f..a331efa3f9fd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.3.4 (final)?
 Extension modules
 -----------------
 
+- Patch #924294: Do no check for AF_INET6 if it is not defined.
+
 - Patch #954115: Properly handle UNC roots in nt.stat.
 
 What's New in Python 2.3.4 (final)?
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e9375faa9226..edf587a70de4 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2975,7 +2975,7 @@ socket_inet_pton(PyObject *self, PyObject *args)
 		return NULL;
 	}
 
-#ifndef ENABLE_IPV6
+#if !defined(ENABLE_IPV6) && defined(AF_INET6)
 	if(af == AF_INET6) {
 		PyErr_SetString(socket_error,
 				"can't use AF_INET6, IPv6 is disabled");