Avoid using type 'gasmix_t': use 'struct gasmix' instead

[ext/subsurface.git] / dive.c

diff --git a/dive.c b/dive.c
index 5039abbbd58ef29880af4f7f2c978bb03137b757..e899c6ccbab5d26cff741f7040da86fd45d96b04 100644 (file)
--- 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)
 
@@ -248,7 +246,7 @@ static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylind
        *res = *b;
 }
 
-static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b)
+static void merge_cylinder_mix(struct gasmix *res, struct gasmix *a, struct gasmix *b)
 {
        if (a->o2.permille)
                b = a;