X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=97654dc5279fbf1ee9d044c9dddba9dae845b789;hb=18b8247cb357a9a716846854e451e306b752e542;hp=92d358d0257de2524a7ed5ffe444b3455426e0ed;hpb=98efa0794aa12eea203216e6f5e7e0bdd336d488;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index 92d358d..97654dc 100644 --- a/dive.h +++ b/dive.h @@ -87,6 +87,7 @@ typedef struct { } cylinder_t; extern double get_depth_units(unsigned int mm, int *frac, const char **units); +extern double get_temp_units(unsigned int mm, const char **units); static inline double mm_to_feet(int mm) { @@ -187,6 +188,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;