summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-08-02 18:37:12 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-08-02 18:37:12 (GMT)
commita9a53c7dc055b54133f2dee33f1834d7566de842 (patch)
treefc16481c7e9123058e7c4ff703b021a1f86d8069
parentf37c0c73fef929a3bf3239bc10fd8ca0d63bcd9c (diff)
downloadcpython-a9a53c7dc055b54133f2dee33f1834d7566de842.zip
cpython-a9a53c7dc055b54133f2dee33f1834d7566de842.tar.gz
cpython-a9a53c7dc055b54133f2dee33f1834d7566de842.tar.bz2
Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() emulation code.
Patch by Philipp Hagemeister.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/getaddrinfo.c2
-rw-r--r--Modules/getnameinfo.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 671878f..14121df 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,9 @@ Core and Builtins
Library
-------
+- Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo()
+ emulation code. Patch by Philipp Hagemeister.
+
- Issue #9803: Don't close IDLE on saving if breakpoint is open.
Patch by Roger Serwy.
diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
index a3ca30a..e2a2edf 100644
--- a/Modules/getaddrinfo.c
+++ b/Modules/getaddrinfo.c
@@ -430,7 +430,7 @@ getaddrinfo(const char*hostname, const char*servname,
break;
#ifdef ENABLE_IPV6
case AF_INET6:
- pfx = ((struct in6_addr *)pton)->s6_addr8[0];
+ pfx = ((struct in6_addr *)pton)->s6_addr[0];
if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
pai->ai_flags &= ~AI_CANONNAME;
break;
diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c
index e9aeafb..f014c11 100644
--- a/Modules/getnameinfo.c
+++ b/Modules/getnameinfo.c
@@ -161,7 +161,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
break;
#ifdef ENABLE_IPV6
case AF_INET6:
- pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0];
+ pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0];
if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
flags |= NI_NUMERICHOST;
break;