From 32918ded244e96e6a9a1c06d132f777a2a52b090 Mon Sep 17 00:00:00 2001
From: jbnadal <jbnadal@awox.com>
Date: Thu, 25 Oct 2018 15:38:30 +0200
Subject: [PATCH] uhttpd: Fix compilation with gcc 6.4

---
 src/3P/uhttpd/client.c | 2 +-
 src/3P/uhttpd/file.c   | 2 +-
 src/3P/uhttpd/utils.h  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/3P/uhttpd/client.c b/src/3P/uhttpd/client.c
index 2c7f74e9..2253320d 100644
--- a/src/3P/uhttpd/client.c
+++ b/src/3P/uhttpd/client.c
@@ -419,7 +419,7 @@ void client_poll_post_data(struct client *cl)
 		if (!d->data_send)
 			return;
 
-		cur_len = min(r->content_length, len);
+		cur_len = u_min(r->content_length, len);
 		if (cur_len) {
 			if (d->data_blocked)
 				break;
diff --git a/src/3P/uhttpd/file.c b/src/3P/uhttpd/file.c
index 047b4dac..a72969a9 100644
--- a/src/3P/uhttpd/file.c
+++ b/src/3P/uhttpd/file.c
@@ -176,7 +176,7 @@ uh_path_lookup(struct client *cl, const char *url)
 	/* create canon path */
 	len = strlen(uh_buf);
 	slash = len && uh_buf[len - 1] == '/';
-	len = min(len, sizeof(path_phys) - 1);
+	len = u_min(len, sizeof(path_phys) - 1);
 
 	for (i = len; i >= 0; i--) {
 		char ch = uh_buf[i];
diff --git a/src/3P/uhttpd/utils.h b/src/3P/uhttpd/utils.h
index c583f453..f07130bd 100644
--- a/src/3P/uhttpd/utils.h
+++ b/src/3P/uhttpd/utils.h
@@ -41,8 +41,8 @@ struct uh_addr {
 	};
 };
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
-#define max(x, y) (((x) > (y)) ? (x) : (y))
+#define u_min(x, y) (((x) < (y)) ? (x) : (y))
+#define u_max(x, y) (((x) > (y)) ? (x) : (y))
 
 #define array_size(x) \
 	(sizeof(x) / sizeof(x[0]))