summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2017-11-27 20:03:05 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-27 13:42:10 -0800
commit568db03228f3fcaafb0252d133ebc1d8c66923ed (patch)
treeb94b92f6b4d45e42cab92b9af3e645bd5e770d6c
parentddb9dba66cef3a1c88e0f91a4f65c44f5769b0f5 (diff)
downloadsubsurface-568db03228f3fcaafb0252d133ebc1d8c66923ed.tar.gz
Move metric variable to parse.c
This is required when moving Shearwater DB parsing into parse-db.c Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
-rw-r--r--core/parse-xml.c1
-rw-r--r--core/parse.c3
-rw-r--r--core/parse.h2
3 files changed, 5 insertions, 1 deletions
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);