Fix ssl module, Python 2.7 doesn't have Py_MAX (#5878)

Signed-off-by: Christian Heimes <christian@python.org>

Fix ssl module, Python 2.7 doesn't have Py_MAX (#5878)
Signed-off-by: Christian Heimes <christian@python.org>
439956a1 · Christian Heimes · GitHub · 4bb9b9ae · 439956a1
Commit 439956a1 authored Feb 25, 2018 by Christian Heimes Committed by GitHub Feb 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Modules/_ssl.c Modules/_ssl.c +2 -1

No files found.
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -610,7 +610,8 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
        }
 #elif defined(HAVE_INET_PTON)
 #ifdef ENABLE_IPV6
-        char packed[Py_MAX(sizeof(struct in_addr), sizeof(struct in6_addr))];
+	#define PySSL_MAX(x, y) (((x) > (y)) ? (x) : (y))
+        char packed[PySSL_MAX(sizeof(struct in_addr), sizeof(struct in6_addr))];
 #else
        char packed[sizeof(struct in_addr)];
 #endif /* ENABLE_IPV6 */