From e90193798246251e45385bef6bac004126cdbb50 Mon Sep 17 00:00:00 2001
From: kfb77 <kfb77>
Date: Tue, 16 Feb 2021 19:16:53 +0100
Subject: [PATCH] Tntnet30: include <cxxtools/log.h> before all vdr includes

---
 epg_events.h   | 4 ++++
 epgsearch.h    | 4 ++++
 live.h         | 4 ++++
 livefeatures.h | 4 ++++
 recman.h       | 4 ++++
 setup.h        | 3 +++
 status.h       | 4 ++++
 tasks.h        | 4 ++++
 timers.h       | 4 ++++
 tools.h        | 4 ++++
 users.h        | 4 ++++
 11 files changed, 43 insertions(+)

diff --git a/epg_events.h b/epg_events.h
index 2b390eac..e8a6ec77 100644
--- a/epg_events.h
+++ b/epg_events.h
@@ -7,6 +7,10 @@
 #include <string>
 #include <list>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/channels.h>
 #include <vdr/epg.h>
 #include <vdr/recording.h>
diff --git a/epgsearch.h b/epgsearch.h
index b3ddf5d0..f8ff69ac 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -8,6 +8,10 @@
 #include <string>
 #include <algorithm>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/channels.h>
 #include <vdr/epg.h>
 
diff --git a/live.h b/live.h
index 24b981da..85c75486 100644
--- a/live.h
+++ b/live.h
@@ -6,6 +6,10 @@
 // STL headers need to be before VDR tools.h (included by <vdr/plugin.h>)
 #include <string>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #ifndef __STL_CONFIG_H
 // To get rid of the swap definition in vdr/tools.h
 # define __STL_CONFIG_H
diff --git a/livefeatures.h b/livefeatures.h
index 98f2d8ac..f55ec896 100644
--- a/livefeatures.h
+++ b/livefeatures.h
@@ -4,6 +4,10 @@
 // STL headers need to be before VDR tools.h (included by <vdr/channels.h>)
 #include <string>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/plugin.h>
 
 namespace vdrlive {
diff --git a/recman.h b/recman.h
index c46edf99..27132108 100644
--- a/recman.h
+++ b/recman.h
@@ -9,6 +9,10 @@
 #include <vector>
 #include <list>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/recording.h>
 
 namespace vdrlive {
diff --git a/setup.h b/setup.h
index d4ee92ae..4ccdff91 100644
--- a/setup.h
+++ b/setup.h
@@ -5,6 +5,9 @@
 #include <list>
 #include <limits>
 #include <string>
+#if TNTVERSION >= 30000
+	#include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
 
 #include <vdr/menuitems.h>
 
diff --git a/status.h b/status.h
index 7379b75a..1726fe13 100644
--- a/status.h
+++ b/status.h
@@ -1,6 +1,10 @@
 #ifndef VDR_LIVE_STATUS_H
 #define VDR_LIVE_STATUS_H
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/status.h>
 
 namespace vdrlive {
diff --git a/tasks.h b/tasks.h
index 4d9db24c..f1bd6c39 100644
--- a/tasks.h
+++ b/tasks.h
@@ -5,6 +5,10 @@
 #include <string>
 #include <vector>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/channels.h>
 #include <vdr/thread.h>
 
diff --git a/timers.h b/timers.h
index 8578524e..615d94b9 100644
--- a/timers.h
+++ b/timers.h
@@ -5,6 +5,10 @@
 #include <list>
 #include <string>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/timers.h>
 
 namespace vdrlive {
diff --git a/tools.h b/tools.h
index 93a621d5..42237f7f 100644
--- a/tools.h
+++ b/tools.h
@@ -7,6 +7,10 @@
 #include <stdexcept>
 #include <vector>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #ifndef __STL_CONFIG_H
 // To get rid of the swap definition in vdr/tools.h
 # define __STL_CONFIG_H
diff --git a/users.h b/users.h
index 2db9137f..868c0953 100644
--- a/users.h
+++ b/users.h
@@ -4,6 +4,10 @@
 // STL headers need to be before VDR tools.h (included by <vdr/channels.h>)
 #include <string>
 
+#if TNTVERSION >= 30000
+        #include <cxxtools/log.h>  // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO)
+#endif
+
 #include <vdr/tools.h>
 #include <vdr/config.h>