Tntnet30: include <cxxtools/log.h> before all vdr includes

a-mair · Feb 16, 2021 · e901937 · e901937
1 parent 771bc5c
commit e901937
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>