From 568db03228f3fcaafb0252d133ebc1d8c66923ed Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Mon, 27 Nov 2017 20:03:05 +0200 Subject: Move metric variable to parse.c This is required when moving Shearwater DB parsing into parse-db.c Signed-off-by: Miika Turkia --- core/parse-xml.c | 1 - core/parse.c | 3 +++ core/parse.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/parse-xml.c b/core/parse-xml.c index e7aa8c68c..a187bfb2e 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -28,7 +28,6 @@ #include "membuffer.h" int verbose, quit, force_root; -int metric = 1; int last_xml_version = -1; int diveid = -1; diff --git a/core/parse.c b/core/parse.c index 228b8d59f..3335b8f57 100644 --- a/core/parse.c +++ b/core/parse.c @@ -9,6 +9,9 @@ #include "parse.h" #include "divelist.h" #include "device.h" +#include "gettext.h" + +int metric = 1; /* static union { diff --git a/core/parse.h b/core/parse.h index 14c24a1d8..f8af63d04 100644 --- a/core/parse.h +++ b/core/parse.h @@ -53,6 +53,8 @@ enum import_source { extern struct dive_table dive_table; extern struct dive_table *target_table; +extern int metric; + int trimspace(char *buffer); void clear_table(struct dive_table *table); void record_dive_to_table(struct dive *dive, struct dive_table *table); -- cgit v1.2.3-70-g09d2