diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-01-03 23:48:50 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-01-05 00:29:20 +0100 |
| commit | 90ba4e5dcad7add798986e493c9b8972bdaf43fe (patch) | |
| tree | 7a0e05641cfcd8b3339409596cebfdd87599732a /core | |
| parent | 5960718075f5941436629ebfaced3997fe83036b (diff) | |
| download | subsurface-90ba4e5dcad7add798986e493c9b8972bdaf43fe.tar.gz | |
Don't define cur_setting in header file
The object cur_setting was defined in core/pref.h. Instead, declare
it as extern and define it in core/parse.c. This silences a compiler
warning, since inclusion of core/pref.h would define the object, which
was then left unused in tests/testparse.cpp.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/parse.c | 2 | ||||
| -rw-r--r-- | core/parse.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/parse.c b/core/parse.c index 5743be3c6..48e62c2e0 100644 --- a/core/parse.c +++ b/core/parse.c @@ -16,7 +16,7 @@ int metric = 1; int diveid = -1; event_allocation_t event_allocation = { .event.deleted = 1 }; - +struct parser_settings cur_settings; struct divecomputer *cur_dc = NULL; struct dive *cur_dive = NULL; diff --git a/core/parse.h b/core/parse.h index 259cf5aaa..affffcfb0 100644 --- a/core/parse.h +++ b/core/parse.h @@ -24,13 +24,14 @@ extern struct sample *cur_sample; extern struct picture *cur_picture; -struct { +struct parser_settings { struct { const char *model; uint32_t deviceid; const char *nickname, *serial_nr, *firmware; } dc; -} cur_settings; +}; +extern struct parser_settings cur_settings; extern bool in_settings; extern bool in_userid; |