From 2a5073113927f5ab5e6f38a7ac6382bd44e7ad5b Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Wed, 19 Aug 2015 23:12:30 +0200 Subject: [PATCH] Leftovers from introduction of in_planner() helper function I have no idea how these could have been left behind Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- deco.c | 4 +++- planner.h | 1 - qthelper.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deco.c b/deco.c index 83c94db40..21332e1e6 100644 --- a/deco.c +++ b/deco.c @@ -21,6 +21,8 @@ #include #include +extern bool in_planner(); + //! Option structure for Buehlmann decompression. struct buehlmann_config { double satmult; //! safety at inert gas accumulation as percentage of effect (more than 100). @@ -167,7 +169,7 @@ static double tissue_tolerance_calc(const struct dive *dive) double lowest_ceiling = 0.0; double tissue_lowest_ceiling[16]; - if (prefs.deco_mode != VPMB || !in_planner) { + if (prefs.deco_mode != VPMB || !in_planner()) { for (ci = 0; ci < 16; ci++) { tissue_inertgas_saturation[ci] = tissue_n2_sat[ci] + tissue_he_sat[ci]; buehlmann_inertgas_a[ci] = ((buehlmann_N2_a[ci] * tissue_n2_sat[ci]) + (buehlmann_He_a[ci] * tissue_he_sat[ci])) / tissue_inertgas_saturation[ci]; diff --git a/planner.h b/planner.h index 20aff89ad..a675989e0 100644 --- a/planner.h +++ b/planner.h @@ -25,7 +25,6 @@ extern struct dive *planned_dive; extern char *cache_data; extern const char *disclaimer; extern double plangflow, plangfhigh; -extern bool in_planner; #ifdef __cplusplus } diff --git a/qthelper.h b/qthelper.h index 4a5ade711..674f036d3 100644 --- a/qthelper.h +++ b/qthelper.h @@ -36,5 +36,6 @@ fraction_t string_to_fraction(const char *str); int getCloudURL(QString &filename); void loadPreferences(); bool parseGpsText(const QString &gps_text, double *latitude, double *longitude); +extern "C" bool in_planner(); #endif // QTHELPER_H