X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=58b6611f84e1f566e434bb623d627a6c489d2dce;hb=84e6f200f64721771be18564830e277f0885e117;hp=40fc5ca2c3668b5fada1924fb9ddb0fd41224324;hpb=c15f798a85db53dae404a9113266a4d2bc72fbc6;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 40fc5ca..58b6611 100644
--- a/dive.h
+++ b/dive.h
@@ -187,6 +187,10 @@ struct dive {
  * the input and output may come in some random format. This
  * keeps track of those units.
  */
+/* turns out in Win32 PASCAL is defined as a calling convention */
+#ifdef WIN32
+#undef PASCAL
+#endif
 struct units {
 	enum { METERS, FEET } length;
 	enum { LITER, CUFT } volume;
@@ -201,7 +205,7 @@ extern struct units input_units, output_units;
 extern int verbose;
 
 struct dive_table {
-	int nr, allocated;
+	int nr, allocated, preexisting;
 	struct dive **dives;
 };
 
@@ -243,7 +247,7 @@ extern void record_dive(struct dive *dive);
 extern struct sample *prepare_sample(struct dive **divep);
 extern void finish_sample(struct dive *dive, struct sample *sample);
 
-extern void report_dives(void);
+extern void report_dives(gboolean imported);
 extern struct dive *fixup_dive(struct dive *dive);
 extern struct dive *try_to_merge(struct dive *a, struct dive *b);
 
@@ -259,6 +263,12 @@ extern void run_ui(void);
 
 extern void report_error(GError* error);
 
+extern void add_cylinder_description(cylinder_type_t *);
+extern void add_people(const char *string);
+extern void add_location(const char *string);
+extern void remember_event(const char *eventname);
+extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data);
+
 extern void dive_list_update_dives(void);
 extern void flush_divelist(struct dive *dive);