From 1fa9f7b3d1d5c90cb231946a6edaf7f748e07436 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 2 Aug 2012 20:37:12 +0200 Subject: [PATCH] Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() emulation code. Patch by Philipp Hagemeister. --- Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/getaddrinfo.c | 2 +- Modules/getnameinfo.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS index 3d2393c572c7..39ba2a9be16d 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -323,6 +323,7 @@ Michael Guravage Lars Gustäbel Thomas Güttler Barry Haddow +Philipp Hagemeister Paul ten Hagen Rasmus Hahn Peter Haight diff --git a/Misc/NEWS b/Misc/NEWS index e989b5b08dba..635f847bff33 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -92,6 +92,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 1d0bfbba8743..9d054d04621f 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 7892ae9ecab4..f7985c9acde0 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; -- 2.47.3