X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=ba5200f51af744c90dc3e86595c6c320e3956288;hb=05857e0a05bc15672ddd5e835714d2cd20405b97;hp=5039abbbd58ef29880af4f7f2c978bb03137b757;hpb=5f79a804b925a8ffbcf933bb6fae4f764b518c8e;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index 5039abb..ba5200f 100644
--- a/dive.c
+++ b/dive.c
@@ -130,8 +130,6 @@ struct dive *fixup_dive(struct dive *dive)
 }
 
 /* Don't pick a zero for MERGE_MIN() */
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#define MAX(a,b) ((a)>(b)?(a):(b))
 #define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
 #define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)