More consistency improvements

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index 92d358d0257de2524a7ed5ffe444b3455426e0ed..5eec6f170da66bbbcbdcd6dbe140d26309976af7 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -87,6 +87,13 @@ typedef struct {
 } cylinder_t;
 
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
+extern double get_volume_units(unsigned int mm, int *frac, const char **units);
+extern double get_temp_units(unsigned int mm, const char **units);
+
+static inline double ml_to_cuft(int ml)
+{
+       return ml / 28317.0;
+}
 
 static inline double mm_to_feet(int mm)
 {
@@ -176,7 +183,7 @@ struct dive {
        depth_t visibility;
        temperature_t airtemp, watertemp;
        cylinder_t cylinder[MAX_CYLINDERS];
-       int otu;
+       int sac, otu;
        struct event *events;
        int samples, alloc_samples;
        struct sample sample[];
@@ -187,6 +194,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;