[poppler] 2 commits - poppler/poppler-config.h.in poppler/PSOutputDev.cc

[Albert Astals Cid]

 poppler/PSOutputDev.cc      |    1 +
 poppler/poppler-config.h.in |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4539d0b002efbd19393fd55a6fb87b013acdb8f1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 27 14:31:20 2016 +0200

    PSOutputDev.cc: std::max requires <algorithm>

diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 183e929..51d899f 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -48,6 +48,7 @@
 #include <signal.h>
 #include <math.h>
 #include <limits.h>
+#include <algorithm>
 #include "goo/GooString.h"
 #include "goo/GooList.h"
 #include "goo/GooHash.h"
commit 4619957cbab81ab0b25f3fdd3ed872f0ad93f074
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 27 14:27:32 2016 +0200

    VS 2013 has fmin() and fmax()

diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 79d452f..d3891fe 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
 #define GCC_PRINTF_FORMAT(fmt_index, va_index)
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1800
 #define fmax(a, b) std::max(a, b)
 #define fmin(a, b) std::min(a, b)
 #endif