When merging dives, match up the cylinders to each other using gasmix

.. so that different computers that have different ordering of the same
cylinders will see the end result the same way.

This also fixes up the sample sensor index and generates special initial
tank change events for the dive computers that had their cylinder
indexes renamed on them.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/dive.h b/dive.h
index 9d359fe18..25cad4bfc 100644
--- a/dive.h
+++ b/dive.h
@@ -683,6 +683,8 @@ void add_gas_to_nth_dp(struct diveplan *diveplan, int idx, int o2, int he);
 void free_dps(struct divedatapoint *dp);
 void get_gas_string(int o2, int he, char *buf, int len);
 
+struct event *get_next_event(struct event *event, char *name);
+
 #ifdef DEBUGFILE
 extern char *debugfilename;
 extern FILE *debugfile;