X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=ipaddr.c;h=899581f0e0a11bae619c03b8ad1d01fb32b010af;hp=e6d24075806693ce1c347eb4f1f1bb417c039799;hb=94a1d5fce6a68fce8216d4b45ef6148d353c2c3a;hpb=c921f0c57414017ae53f7a14513e8f2188d4a61e

diff --git a/ipaddr.c b/ipaddr.c
index e6d2407..899581f 100644
--- a/ipaddr.c
+++ b/ipaddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "ipaddr.h"
+#include "util.h"
 
 #define DEFAULT_ALLOC 2
 #define EXTEND_ALLOC_BY 4
@@ -130,7 +131,6 @@ static void ipset_append_range(struct ipset *a, struct iprange r)
     a->d[a->l-1]=r;
 }
 
-#define max(a,b) (a>b?a:b)
 struct ipset *ipset_union(struct ipset *a, struct ipset *b)
 {
     struct ipset *c;
@@ -155,7 +155,7 @@ struct ipset *ipset_union(struct ipset *a, struct ipset *b)
 	    ipset_append_range(c,r);
 	else if (r.a <= c->d[c->l-1].b+1)
 	    /* Extends (or is consumed by) the last range */
-	    c->d[c->l-1].b=max(c->d[c->l-1].b, r.b);
+	    c->d[c->l-1].b=MAX(c->d[c->l-1].b, r.b);
 	else
 	    ipset_append_range(c,r);
     }