summaryrefslogtreecommitdiff
path: root/tools.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-05-21 09:37:45 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2017-05-21 09:37:45 +0200
commit82813f48c4f95d8cedbd2add70baf7962aad2ca1 (patch)
tree5df83038e57e3ddb34bb12a54b0499f745d1abbe /tools.h
parent0b9870959beb7ae6a063f73fd5fada8f1faefadb (diff)
downloadvdr-82813f48c4f95d8cedbd2add70baf7962aad2ca1.tar.gz
vdr-82813f48c4f95d8cedbd2add70baf7962aad2ca1.tar.bz2
Added the macro VDR_NO_STL_PROTOTYPES to tools.h
Diffstat (limited to 'tools.h')
-rw-r--r--tools.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools.h b/tools.h
index 3bd7f9d2..5eec6753 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.h 4.8 2017/05/09 08:37:23 kls Exp $
+ * $Id: tools.h 4.9 2017/05/21 09:33:12 kls Exp $
*/
#ifndef __TOOLS_H
@@ -51,7 +51,10 @@ template<class T> inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q;
#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
#define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
-#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
+#ifdef __STL_CONFIG_H // this used to work with older versions of STL, but they removed this macro in newer versions
+#define VDR_NO_STL_PROTOTYPES
+#endif
+#ifndef VDR_NO_STL_PROTOTYPES // in case some plugin needs to use the STL
template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }