diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-07-15 22:38:21 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 05:42:55 -0700 |
| commit | b720f3697874338c3bf77a65ed3b319897841e26 (patch) | |
| tree | a484e7613f816698faf91a333f6ffb155944533c /core/dive.h | |
| parent | b862e028c6695e9adfdffc2b46ad3c433ec7f214 (diff) | |
| download | subsurface-b720f3697874338c3bf77a65ed3b319897841e26.tar.gz | |
Cleanup: fix include weirdness concerning string_to_*() functions
The string_to_*() functions were declared in dive.h and qthelper.h.
Moreover in one file they were declared with C in the other with
C++ linkage. This only works because qthelper.h includes dive.h
first.
Fix this anomaly by declaring the functions only in qthelper.h,
but moving them from the C++ to the C part.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/dive.h')
| -rw-r--r-- | core/dive.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/dive.h b/core/dive.h index 1be628151..406a7b672 100644 --- a/core/dive.h +++ b/core/dive.h @@ -530,11 +530,6 @@ extern void set_git_prefs(const char *prefs); extern char *get_dive_date_c_string(timestamp_t when); extern void update_setpoint_events(const struct dive *dive, struct divecomputer *dc); -extern weight_t string_to_weight(const char *str); -extern depth_t string_to_depth(const char *str); -extern pressure_t string_to_pressure(const char *str); -extern volume_t string_to_volume(const char *str, pressure_t workp); -extern fraction_t string_to_fraction(const char *str); extern void average_max_depth(struct diveplan *dive, int *avg_depth, int *max_depth); #ifdef __cplusplus |