From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 11 Apr 2010 17:39:31 +0000 (+0200)
Subject: Don't redefine MAX if it already exists.
X-Git-Tag: release-1.0.13~2
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=0ddce6370d39eff162bd212a6e47fe3a8e96a09e;hp=a9bbb3357a89e27185312fbce0ee134eda4eda90

Don't redefine MAX if it already exists.
---

diff --git a/src/route.c b/src/route.c
index 3d8d54af..1caf738f 100644
--- a/src/route.c
+++ b/src/route.c
@@ -50,7 +50,10 @@ static const size_t ip6_size = sizeof(struct ip6_hdr);
 static const size_t icmp6_size = sizeof(struct icmp6_hdr);
 static const size_t ns_size = sizeof(struct nd_neighbor_solicit);
 static const size_t opt_size = sizeof(struct nd_opt_hdr);
+
+#ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 /* RFC 1071 */