diff options
| author | Brett Cannon <brett@python.org> | 2013-06-04 21:36:07 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-06-04 21:36:07 (GMT) |
| commit | c97ec8fa6978657bfb8069db4128f785b29ea0aa (patch) | |
| tree | 46aa19c3d8f30869ec71ad17a39bc4275b5c4cf6 /Modules/socketmodule.c | |
| parent | af38f5a5032e49d527adcb9c594abfeba5d9b9b2 (diff) | |
| parent | 640c35ce135d71c6aafa13bb5985150f680416cc (diff) | |
| download | cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.zip cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.tar.gz cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.tar.bz2 | |
merge
Diffstat (limited to 'Modules/socketmodule.c')
| -rw-r--r-- | Modules/socketmodule.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index efbde3a..f1e310d 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -95,9 +95,6 @@ Local naming conventions: #include "Python.h" #include "structmember.h" -#undef MAX -#define MAX(x, y) ((x) < (y) ? (y) : (x)) - /* Socket object documentation */ PyDoc_STRVAR(sock_doc, "socket([family[, type[, proto]]]) -> socket object\n\ @@ -4819,7 +4816,7 @@ socket_inet_pton(PyObject *self, PyObject *args) char* ip; int retval; #ifdef ENABLE_IPV6 - char packed[MAX(sizeof(struct in_addr), sizeof(struct in6_addr))]; + char packed[Py_MAX(sizeof(struct in_addr), sizeof(struct in6_addr))]; #else char packed[sizeof(struct in_addr)]; #endif @@ -4870,7 +4867,7 @@ socket_inet_ntop(PyObject *self, PyObject *args) int len; const char* retval; #ifdef ENABLE_IPV6 - char ip[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1]; + char ip[Py_MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1]; #else char ip[INET_ADDRSTRLEN + 1]; #endif |