File osdserver-gcc6.patch of Package vdr-plugin-osdserver

Overview Repositories Revisions Requests Users Attributes Meta

File osdserver-gcc6.patch of Package vdr-plugin-osdserver

diff --git a/Makefile b/Makefile
index 0e423ae..8976fdd 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ PACKAGE = vdr-$(ARCHIVE)
 INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DPLUGINVERSION='"$(VERSION)"'
+DEFINES += -D__STL_CONFIG_H=1
 
 ### The object files (add further files here):
 
diff --git a/interpreter.c b/interpreter.c
index b607dad..7b70310 100644
--- a/interpreter.c
+++ b/interpreter.c
@@ -1347,7 +1347,7 @@ bool cCommandProcessor::HandleSleepEvent(int &timeout) {
         return true;
     }
 
-    timeout=min(ms,100);
+    timeout=std::min(ms,100);
     return false;
 }
 
diff --git a/tools.h b/tools.h
index 1366572..879d8f4 100644
--- a/tools.h
+++ b/tools.h
@@ -2,6 +2,7 @@
 #define __OSDSERVER_TOOLS_H
 
 #include <ctype.h>
+#include <algorithm>
 
 #include <vdr/tools.h>
 #include <vdr/remote.h>
@@ -40,19 +41,19 @@ public:
     void SetRead(int fd) {
         if (fd >= 0 && fd < FD_SETSIZE) {
             FD_SET(fd,&readfds);
-            fdmax=max(fd,fdmax);
+            fdmax=std::max(fd,fdmax);
         }
     }
     void SetWrite(int fd) {
         if (fd >= 0 && fd < FD_SETSIZE) {
             FD_SET(fd,&writefds);
-            fdmax=max(fd,fdmax);
+            fdmax=std::max(fd,fdmax);
         }
     }
     void SetExcept(int fd) {
         if (fd >= 0 && fd < FD_SETSIZE) {
             FD_SET(fd,&exceptfds);
-            fdmax=max(fd,fdmax);
+            fdmax=std::max(fd,fdmax);
         }
     }
     void ClearRead(int fd) {

Places

File osdserver-gcc6.patch of Package vdr-plugin-osdserver

Places