diff options
| author |  Tomaz Canabrava <tcanabrava@kde.org> | 2016-03-06 06:52:55 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-06 11:03:00 -0800 |
| commit | 39313c5b3340683b9e4475987308dac24491a982 (patch) | |
| tree | 5507c58efe70499262b2e24b2bd24ef6ec9e7f4c /subsurface-core | |
| parent | 710b3615fe875cd99a78f643790201b587ffef97 (diff) | |
| download | subsurface-39313c5b3340683b9e4475987308dac24491a982.tar.gz | |
Clean up handling of various include file
This is in the context of the iOS port and shouldn't impact any of the
other builds.
[Dirk Hohndel: refactored the iOS patches]
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core')
| -rw-r--r-- | subsurface-core/configuredivecomputerthreads.cpp | 1 | ||||
| -rw-r--r-- | subsurface-core/file.c | 3 | ||||
| -rw-r--r-- | subsurface-core/libdivecomputer.c | 2 | ||||
| -rw-r--r-- | subsurface-core/libdivecomputer.h | 2 | ||||
| -rw-r--r-- | subsurface-core/subsurfacestartup.c | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/subsurface-core/configuredivecomputerthreads.cpp b/subsurface-core/configuredivecomputerthreads.cpp index 53a8aa7f1..0b6487c96 100644 --- a/subsurface-core/configuredivecomputerthreads.cpp +++ b/subsurface-core/configuredivecomputerthreads.cpp @@ -1,6 +1,7 @@ #include "configuredivecomputerthreads.h" #include "libdivecomputer/hw.h" #include "libdivecomputer.h" +#include <libdivecomputer/version.h> #define OSTC3_GAS1 0x10 #define OSTC3_GAS2 0x11 diff --git a/subsurface-core/file.c b/subsurface-core/file.c index 3f6dd6dbb..3bac96ea0 100644 --- a/subsurface-core/file.c +++ b/subsurface-core/file.c @@ -923,13 +923,14 @@ int parse_csv_file(const char *filename, char **params, int pnr, const char *csv * input file added as last parameter. */ +#ifndef SUBSURFACE_MOBILE if (verbose >= 2) { fprintf(stderr, "(echo '<csv>'; cat %s;echo '</csv>') | xsltproc ", filename); for (i=0; params[i]; i+=2) fprintf(stderr, "--stringparam %s %s ", params[i], params[i+1]); fprintf(stderr, "%s/xslt/csv2xml.xslt -\n", SUBSURFACE_SOURCE); } - +#endif ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params); free(mem.buffer); diff --git a/subsurface-core/libdivecomputer.c b/subsurface-core/libdivecomputer.c index 39908847b..6cfcf015d 100644 --- a/subsurface-core/libdivecomputer.c +++ b/subsurface-core/libdivecomputer.c @@ -11,7 +11,7 @@ #include "libdivecomputer.h" #include <libdivecomputer/uwatec.h> #include <libdivecomputer/hw.h> - +#include <libdivecomputer/version.h> /* Christ. Libdivecomputer has the worst configuration system ever. */ #ifdef HW_FROG_H diff --git a/subsurface-core/libdivecomputer.h b/subsurface-core/libdivecomputer.h index f52f6959a..99f1c2490 100644 --- a/subsurface-core/libdivecomputer.h +++ b/subsurface-core/libdivecomputer.h @@ -7,7 +7,9 @@ #ifdef DC_VERSION /* prevent a warning with wingdi.h */ #undef DC_VERSION #endif +#ifdef HAVE_LIBDIVECOMPUTER #include <libdivecomputer/version.h> +#endif #include <libdivecomputer/device.h> #include <libdivecomputer/parser.h> diff --git a/subsurface-core/subsurfacestartup.c b/subsurface-core/subsurfacestartup.c index c39c89c17..864134724 100644 --- a/subsurface-core/subsurfacestartup.c +++ b/subsurface-core/subsurfacestartup.c @@ -5,6 +5,7 @@ #include "gettext.h" #include "qthelperfromc.h" #include "git-access.h" +#include "libdivecomputer/version.h" struct preferences prefs, informational_prefs; struct preferences default_prefs = { |