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

diff --git a/Misc/NEWS b/Misc/NEWS
index 62be689ff76fa8216b1a841a2e08f4c5675173e2..a331efa3f9fd4f1c4660d776f41735426d601c93 100644 (file)
--- 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 e9375faa92266351cd08b1cd041d8c97689e118a..edf587a70de4ea51d33a9ede99d9456ad66d9d42 100644 (file)
--- 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");