From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 13 Aug 2011 08:44:40 +0000 (+0200)
Subject: Do not define max twice.
X-Git-Tag: v1.13.1~1
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=706871e92e4c0bbca53972451921781cc7afbb8b

Do not define max twice.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c45ff180..f4ac2559 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-13  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+	* retr.c (fd_read_body): Ensure max is not already defined.
+
 	* mswindows.h (snprintf): Remove definition.
 	(vsnprintf): Likewise.
 
diff --git a/src/retr.c b/src/retr.c
index 54937d86..73947658 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -207,6 +207,7 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
               wgint *qtyread, wgint *qtywritten, double *elapsed, int flags)
 {
   int ret = 0;
+#undef max
 #define max(a,b) ((a) > (b) ? (a) : (b))
   int dlbufsize = max (BUFSIZ, 8 * 1024);
   char *dlbuf = xmalloc (dlbufsize);