aboutsummaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
authorGravatar Nathan Samson <nathansamson@gmail.com>2011-09-05 22:14:53 +0200
committerGravatar Nathan Samson <nathansamson@gmail.com>2011-09-05 22:15:30 +0200
commit11becb87505b8cdf6fbf2f10941f87d394e49f80 (patch)
tree01e92af5557cddce2f69c5bb758692d52146bcd3 /dive.c
parent65ef1bae20e9c908745115d0d82b7232dc5d1b26 (diff)
downloadsubsurface-11becb87505b8cdf6fbf2f10941f87d394e49f80.tar.gz
Report errors when opening files
Signed-off-by: Nathan Samson <nathansamson@gmail.com>
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/dive.c b/dive.c
index 5039abbbd..ba5200f51 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)