projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9bbb33
)
Don't redefine MAX if it already exists.
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 11 Apr 2010 17:39:31 +0000
(19:39 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 11 Apr 2010 17:39:31 +0000
(19:39 +0200)
src/route.c
patch
|
blob
|
history
diff --git
a/src/route.c
b/src/route.c
index
3d8d54a
..
1caf738
100644
(file)
--- 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 */