1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

config: remove unnecessary includes and add conditional compilation to config_helper.h

This commit is contained in:
Niklas Eiling 2018-10-24 10:04:21 -04:00
parent a693e7b5db
commit f588e4419d
4 changed files with 5 additions and 3 deletions

View file

@ -23,7 +23,10 @@
#pragma once
#include <jansson.h>
#ifdef LIBCONFIG_FOUND
#include <libconfig.h>
#endif /* LIBCONFIG_FOUND */
#include <villas/sample.h>
@ -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[]);

View file

@ -30,7 +30,6 @@
#include <villas/utils.h>
#include <villas/node.h>
#include <villas/plugin.h>
#include <villas/config_helper.h>
int hook_init(struct hook *h, struct hook_type *vt, struct path *p, struct node *n)
{

View file

@ -28,7 +28,6 @@
#include <villas/node.h>
#include <villas/utils.h>
#include <villas/plugin.h>
#include <villas/config_helper.h>
#include <villas/mapping.h>
#include <villas/timing.h>
#include <villas/signal.h>

View file

@ -39,7 +39,6 @@
#include <villas/plugin.h>
#include <villas/memory.h>
#include <villas/config.h>
#include <villas/config_helper.h>
#include <villas/kernel/rt.h>