diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-05-11 21:33:46 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-11 22:02:24 -0700 |
| commit | f5ef74202b8295400e5f26d1fa80b90223f822da (patch) | |
| tree | a513e68f368055bf2f194dc662fb4d87d2d2a889 /parse-xml.c | |
| parent | 5775905727150b4f2f5556b84814acdc46e2d717 (diff) | |
| download | subsurface-f5ef74202b8295400e5f26d1fa80b90223f822da.tar.gz | |
Require libzip, xslt and osm-gps-map in all builds
Conditional inclusion of libzip, xslt and osm-gps-map just
makes testing more cumbersome, since testers might lack
Subsurface features without knowing.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/parse-xml.c b/parse-xml.c index 4636a000c..ac6e63eba 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -10,14 +10,9 @@ #include <libxml/parser.h> #include <libxml/parserInternals.h> #include <libxml/tree.h> -#ifdef XSLT #include <libxslt/transform.h> -#endif #include <glib/gi18n.h> - -#ifdef SQLITE3 #include<sqlite3.h> -#endif #include "dive.h" #include "device.h" @@ -1601,15 +1596,12 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, } reset_all(); dive_start(); -#ifdef XSLT doc = test_xslt_transforms(doc, error); -#endif traverse(xmlDocGetRootElement(doc)); dive_end(); xmlFreeDoc(doc); } -#ifdef SQLITE3 extern int dm4_events(void *handle, int columns, char **data, char **column) { event_start(); @@ -1816,12 +1808,10 @@ extern int dm4_dive(void *param, int columns, char **data, char **column) */ return SQLITE_OK; } -#endif int parse_dm4_buffer(const char *url, const char *buffer, int size, struct dive_table *table, GError **error) { -#ifdef SQLITE3 int retval; char *err = NULL; sqlite3 *handle; @@ -1846,7 +1836,6 @@ int parse_dm4_buffer(const char *url, const char *buffer, int size, } sqlite3_close(handle); -#endif return 0; } @@ -1860,8 +1849,6 @@ void parse_xml_exit(void) xmlCleanupParser(); } -#ifdef XSLT - /* Maybe we'll want a environment variable that can override this.. */ static const char *xslt_path = XSLT ":xslt:."; @@ -1962,4 +1949,3 @@ static xmlDoc *test_xslt_transforms(xmlDoc *doc, GError **error) } return doc; } -#endif |