[vdr-plugin-osdserver] 01/02: Added workaround for stl clash with GCC 6 and vdr/tools.h (Closes: #811994)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/0.1.3-17
in repository vdr-plugin-osdserver.

commit be0b740486ba79d6ccf97e230b13613d0d6cc197
Author: Tobias Grimm <etobi at debian.org>
Date:   Sat Jan 30 15:18:33 2016 +0100

    Added workaround for stl clash with GCC 6 and vdr/tools.h
    (Closes: #811994)
---
 debian/patches/ggc6-fixes.patch | 63 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 64 insertions(+)

diff --git a/debian/patches/ggc6-fixes.patch b/debian/patches/ggc6-fixes.patch
new file mode 100644
index 0000000..ca81670
--- /dev/null
+++ b/debian/patches/ggc6-fixes.patch
@@ -0,0 +1,63 @@
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@
+ 
+ INCLUDES += -I$(VDRDIR)/include
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DPLUGINVERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DPLUGINVERSION='"$(VERSION)"' -D__STL_CONFIG_H
+ 
+ ### The object files (add further files here):
+ 
+--- a/interpreter.c
++++ b/interpreter.c
+@@ -5,6 +5,7 @@
+ 
+ #include "interpreter.h"
+ 
++#include <algorithm>
+ 
+ // ---------------
+ //   cConnection
+@@ -1347,7 +1348,7 @@
+         return true;
+     }
+ 
+-    timeout=min(ms,100);
++    timeout=std::min(ms,100);
+     return false;
+ }
+ 
+--- a/tools.h
++++ b/tools.h
+@@ -1,6 +1,7 @@
+ #ifndef __OSDSERVER_TOOLS_H
+ #define __OSDSERVER_TOOLS_H
+ 
++#include <algorithm>
+ #include <ctype.h>
+ 
+ #include <vdr/tools.h>
+@@ -40,19 +41,19 @@
+     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) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dbdadec
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ggc6-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-osdserver.git