From bc425337ba1c91971c1b47ccf20351e802f5bb96 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 15 Sep 2021 17:24:33 +0200 Subject: [PATCH] config: fix compiler errors --- include/villas/config.hpp | 8 ++++---- lib/config.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/villas/config.hpp b/include/villas/config.hpp index 1d6af3082..b96e8436c 100644 --- a/include/villas/config.hpp +++ b/include/villas/config.hpp @@ -27,16 +27,16 @@ #include #include -#ifdef WITH_CONFIG - #include -#endif - #include #include #include #include +#ifdef WITH_CONFIG + #include +#endif + namespace villas { namespace node { diff --git a/lib/config.cpp b/lib/config.cpp index 0a90b134a..bca30aca1 100644 --- a/lib/config.cpp +++ b/lib/config.cpp @@ -253,9 +253,9 @@ json_t * Config::libconfigDecode(FILE *f) config_set_include_func(&cfg, includeFuncStub); #else if (includeDirectories.size() > 0) { - logger->info("Setting include dir to: {}", inclDirs.front()); + logger->info("Setting include dir to: {}", includeDirectories.front()); - config_set_include_dir(&cfg, inclDirs.front().c_str()); + config_set_include_dir(&cfg, includeDirectories.front().c_str()); if (includeDirectories.size() > 1) { logger->warn("Ignoring all but the first include directories for libconfig");