From a76c4d04e31b35be1f2402f3588c1eac6807fbc2 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Mon, 17 Sep 2018 22:16:15 +0200
Subject: [PATCH] log: do not use V macro which ambigious when compiling
 against Eigen3

---
 include/villas/config.h.in | 1 -
 lib/log.c                  | 2 +-
 lib/super_node.c           | 2 +-
 src/villas-convert.cpp     | 2 +-
 src/villas-pipe.cpp        | 2 +-
 src/villas-test-rtt.cpp    | 2 +-
 src/villas-test-shmem.cpp  | 2 +-
 tests/unit/log.c           | 2 +-
 tests/unit/main.c          | 2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/villas/config.h.in b/include/villas/config.h.in
index 31877d14b..490cee296 100644
--- a/include/villas/config.h.in
+++ b/include/villas/config.h.in
@@ -62,7 +62,6 @@ extern "C" {
 #define KERNEL_VERSION_MIN	6
 
 #cmakedefine BUILDID "@BUILDID@"
-#cmakedefine V @V@
 #cmakedefine PREFIX "@PREFIX@"
 
 /* Available Features */
diff --git a/lib/log.c b/lib/log.c
index 9fddeac62..66627a129 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -51,7 +51,7 @@ void register_default_log()
 	int ret;
 	static struct log default_log;
 
-	ret = log_init(&default_log, V, LOG_ALL);
+	ret = log_init(&default_log, 2, LOG_ALL);
 	if (ret)
 		error("Failed to initalize log");
 
diff --git a/lib/super_node.c b/lib/super_node.c
index d53696917..98f84d010 100644
--- a/lib/super_node.c
+++ b/lib/super_node.c
@@ -49,7 +49,7 @@ int super_node_init(struct super_node *sn)
 
 	assert(sn->state == STATE_DESTROYED);
 
-	ret = log_init(&sn->log, V, LOG_ALL);
+	ret = log_init(&sn->log, 2, LOG_ALL);
 	if (ret)
 		return ret;
 
diff --git a/src/villas-convert.cpp b/src/villas-convert.cpp
index e1d406f82..455f72fab 100644
--- a/src/villas-convert.cpp
+++ b/src/villas-convert.cpp
@@ -46,7 +46,7 @@ static void usage()
 
 int main(int argc, char *argv[])
 {
-	int ret, level = V;
+	int ret, level = 2;
 	const char *input_format = "villas.human";
 	const char *output_format = "villas.human";
 
diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp
index 1e2aded99..81996a2c1 100644
--- a/src/villas-pipe.cpp
+++ b/src/villas-pipe.cpp
@@ -243,7 +243,7 @@ leave:	info("Reached receive limit. Terminating...");
 
 int main(int argc, char *argv[])
 {
-	int ret, level = V, timeout = 0;
+	int ret, level = 2, timeout = 0;
 	bool reverse = false;
 	const char *format = "villas.human";
 
diff --git a/src/villas-test-rtt.cpp b/src/villas-test-rtt.cpp
index 739dfdef3..e7292d409 100644
--- a/src/villas-test-rtt.cpp
+++ b/src/villas-test-rtt.cpp
@@ -129,7 +129,7 @@ check:		if (optarg == endptr)
 	if (ret)
 		error("Failed to initialize signals");
 
-	ret = log_init(&sn.log, V, LOG_ALL);
+	ret = log_init(&sn.log, 2, LOG_ALL);
 	if (ret)
 		return ret;
 
diff --git a/src/villas-test-shmem.cpp b/src/villas-test-shmem.cpp
index b9b38d965..454af976c 100644
--- a/src/villas-test-shmem.cpp
+++ b/src/villas-test-shmem.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 		.samplelen = DEFAULT_SHMEM_SAMPLELEN
 	};
 
-	log_init(&log, V, LOG_ALL);
+	log_init(&log, 2, LOG_ALL);
 	log_open(&log);
 
 
diff --git a/tests/unit/log.c b/tests/unit/log.c
index 2e08f14fb..4d9b6b434 100644
--- a/tests/unit/log.c
+++ b/tests/unit/log.c
@@ -35,7 +35,7 @@ static struct log l;
 
 static void init()
 {
-	log_init(&l, V, LOG_ALL);
+	log_init(&l, 2, LOG_ALL);
 }
 
 static void fini()
diff --git a/tests/unit/main.c b/tests/unit/main.c
index af47e52cc..3a8748cf1 100644
--- a/tests/unit/main.c
+++ b/tests/unit/main.c
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 	struct criterion_test_set *tests;
 	struct log log;
 
-	ret = log_init(&log, V, LOG_ALL);
+	ret = log_init(&log, 2, LOG_ALL);
 	if (ret)
 		error("Failed to initialize logging sub-system");