From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sun, 10 Nov 2013 18:43:22 +0000 (-0500)
Subject: Issue #7171: Update syntax to replace MAX in favor of Py_MAX (matching implementation... 
X-Git-Tag: v3.4.0b1~327^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ec784c2df2cfe9783d6434a46815c8d0c4f29f0;p=thirdparty%2FPython%2Fcpython.git

Issue #7171: Update syntax to replace MAX in favor of Py_MAX (matching implementation for Unix).
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6c4b050371aa..fa61cfd02f88 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5188,7 +5188,11 @@ socket_inet_ntop(PyObject *self, PyObject *args)
     int len;
     struct sockaddr_in6 addr;
     DWORD addrlen, ret, retlen;
-    char ip[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
+#ifdef ENABLE_IPV6
+    char ip[Py_MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
+#else
+    char ip[INET_ADDRSTRLEN + 1];
+#endif
 
     /* Guarantee NUL-termination for PyUnicode_FromString() below */
     memset((void *) &ip[0], '\0', sizeof(ip));