summaryrefslogtreecommitdiffstats
path: root/parse-xml.c
diff options
context:
space:
mode:
Diffstat (limited to 'parse-xml.c')
-rw-r--r--parse-xml.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/parse-xml.c b/parse-xml.c
index f88d4ef7f..916a780d1 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -129,29 +129,8 @@ static int match(const char *pattern, int plen,
struct units input_units;
-
-/*
- * We're going to default to SI units for input. Yes,
- * technically the SI unit for pressure is Pascal, but
- * we default to bar (10^5 pascal), which people
- * actually use. Similarly, C instead of Kelvin.
- * And kg instead of g.
- */
-const struct units SI_units = {
- .length = METERS,
- .volume = LITER,
- .pressure = BAR,
- .temperature = CELSIUS,
- .weight = KG
-};
-
-const struct units IMPERIAL_units = {
- .length = FEET,
- .volume = CUFT,
- .pressure = PSI,
- .temperature = FAHRENHEIT,
- .weight = LBS
-};
+const struct units SI_units = SI_UNITS;
+const struct units IMPERIAL_units = IMPERIAL_UNITS;
/*
* Dive info as it is being built up..