From f588e4419d42c03394eee198aec9e2c2d12257ed Mon Sep 17 00:00:00 2001 From: Niklas Eiling Date: Wed, 24 Oct 2018 10:04:21 -0400 Subject: [PATCH] config: remove unnecessary includes and add conditional compilation to config_helper.h --- include/villas/config_helper.h | 5 +++++ lib/hook.c | 1 - lib/node.c | 1 - lib/super_node.c | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/villas/config_helper.h b/include/villas/config_helper.h index 96bdf704f..af1be6658 100644 --- a/include/villas/config_helper.h +++ b/include/villas/config_helper.h @@ -23,7 +23,10 @@ #pragma once #include + +#ifdef LIBCONFIG_FOUND #include +#endif /* LIBCONFIG_FOUND */ #include @@ -31,11 +34,13 @@ extern "C" { #endif +#ifdef LIBCONFIG_FOUND /* Convert a libconfig object to a jansson object */ json_t *config_to_json(config_setting_t *cfg); /* Convert a jansson object into a libconfig object. */ int json_to_config(json_t *json, config_setting_t *parent); +#endif /* LIBCONFIG_FOUND */ /* Create a JSON object from command line parameters. */ json_t *json_load_cli(int argc, char *argv[]); diff --git a/lib/hook.c b/lib/hook.c index 65ca2340b..54b381a50 100644 --- a/lib/hook.c +++ b/lib/hook.c @@ -30,7 +30,6 @@ #include #include #include -#include int hook_init(struct hook *h, struct hook_type *vt, struct path *p, struct node *n) { diff --git a/lib/node.c b/lib/node.c index 280841523..fbbc8f653 100644 --- a/lib/node.c +++ b/lib/node.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/super_node.c b/lib/super_node.c index 98f84d010..022ea56f8 100644 --- a/lib/super_node.c +++ b/lib/super_node.c @@ -39,7 +39,6 @@ #include #include #include -#include #include