summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2012-08-18 08:28:52 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-08-18 08:28:52 -0700
commitc26c370c2b519cbceaa231cc3c840c78ca92d2a7 (patch)
treea955a7fe8c18f1d7e59e73c48726911cfadfdeb8 /dive.h
parent5487606fda75f133e26900aede1430b8929f8e18 (diff)
downloadsubsurface-c26c370c2b519cbceaa231cc3c840c78ca92d2a7.tar.gz
Correct multi-edit equipment update logic
I lied in the commit message for commit 0468535524a3 ("When editing multiple files, don't override existing equipment entries"); the changes there did not parallel the logic for the string entries. Now I think it does. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/dive.h b/dive.h
index b42668c16..41f427a2c 100644
--- a/dive.h
+++ b/dive.h
@@ -92,8 +92,11 @@ typedef struct {
const char *description; /* "integrated", "belt", "ankle" */
} weightsystem_t;
-extern int cylinder_none(void *_data);
-extern int weightsystem_none(void *_data);
+extern gboolean cylinder_none(void *_data);
+extern gboolean no_cylinders(cylinder_t *cyl);
+extern gboolean cylinders_equal(cylinder_t *cyl1, cylinder_t *cyl2);
+extern gboolean no_weightsystems(weightsystem_t *ws);
+extern gboolean weightsystems_equal(weightsystem_t *ws1, weightsystem_t *ws2);
extern int get_pressure_units(unsigned int mb, const char **units);
extern double get_depth_units(unsigned int mm, int *frac, const char **units);