summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-03-03 22:55:18 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 18:19:07 +0300
commitf2cdca7bccfcdfa04639600689b2b13b38b56898 (patch)
tree1482089014e746fc6ccbfd7bcd98926bb70cb759 /core
parent25234c0513cab19abafb6d73613df35da7bc5663 (diff)
downloadsubsurface-f2cdca7bccfcdfa04639600689b2b13b38b56898.tar.gz
Cleanup: move declaration of get_stylesheet() to qthelper.h
The function is defined in qthelper.c and thus not all users of dive.h have to suck in the xslt headers. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
-rw-r--r--core/dive.h4
-rw-r--r--core/errorhelper.c1
-rw-r--r--core/qthelper.h3
-rw-r--r--core/uemis-downloader.c1
4 files changed, 5 insertions, 4 deletions
diff --git a/core/dive.h b/core/dive.h
index 068b36810..fd03bc4ae 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -13,8 +13,6 @@
#include <string.h>
#include <sys/stat.h>
#include "divesite.h"
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
#include "units.h"
@@ -507,8 +505,6 @@ extern bool subsurface_user_is_root(void);
extern timestamp_t get_times();
-extern xsltStylesheetPtr get_stylesheet(const char *name);
-
extern timestamp_t utc_mktime(struct tm *tm);
extern void utc_mkdate(timestamp_t, struct tm *tm);
diff --git a/core/errorhelper.c b/core/errorhelper.c
index 5390c4c20..cad595912 100644
--- a/core/errorhelper.c
+++ b/core/errorhelper.c
@@ -3,6 +3,7 @@
// Clang has a bug on zero-initialization of C structs.
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
#endif
+#include <stdarg.h>
#include "dive.h"
#include "membuffer.h"
diff --git a/core/qthelper.h b/core/qthelper.h
index 3b7ff2c59..2a91df9ef 100644
--- a/core/qthelper.h
+++ b/core/qthelper.h
@@ -3,6 +3,8 @@
#define QTHELPER_H
#include <stdint.h>
+#include <libxslt/transform.h>
+#include <libxslt/xsltutils.h>
#include "dive.h"
#include "divelist.h"
@@ -161,6 +163,7 @@ void cache_insert(int tissue, int timestep, enum inertgas gas, double value);
void print_qt_versions();
void lock_planner();
void unlock_planner();
+xsltStylesheetPtr get_stylesheet(const char *name);
#ifdef __cplusplus
}
diff --git a/core/uemis-downloader.c b/core/uemis-downloader.c
index 30ad972cc..56617a0ae 100644
--- a/core/uemis-downloader.c
+++ b/core/uemis-downloader.c
@@ -16,6 +16,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <stdio.h>
+#include <stdarg.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>