Split up preference data structure definition into 'pref.h'

.. and rename the badly named 'output_units/input_units' variables.

We used to have this confusing thing where we had two different units
(input vs output) that *look* like they are mirror images, but in fact
"output_units" was the user units, and "input_units" are the XML parsing
units.

So this renames them to be clearer.  "output_units" is now just "units"
(it's the units a user would ever see), and "input_units" is now
"xml_parsing_units" and set by the XML file parsers to reflect the units
of the parsed file.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/dive.h b/dive.h
index 0151c6a72..f746909ad 100644
--- a/dive.h
+++ b/dive.h
@@ -426,9 +426,9 @@ struct units {
 	.weight = LBS			\
 }
 extern const struct units SI_units, IMPERIAL_units;
-extern struct units input_units;
+extern struct units xml_parsing_units;
 
-extern struct units *get_output_units(void);
+extern struct units *get_units(void);
 extern int verbose;
 
 struct dive_table {
@@ -613,4 +613,7 @@ void free_dps(struct divedatapoint *dp);
 extern char *debugfilename;
 extern FILE *debugfile;
 #endif
+
+#include "pref.h"
+
 #endif /* DIVE_H */