diff options
Diffstat (limited to 'external/poppler/poppler-vs2013.patch.1')
| -rw-r--r-- | external/poppler/poppler-vs2013.patch.1 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/external/poppler/poppler-vs2013.patch.1 b/external/poppler/poppler-vs2013.patch.1 index 4b201f9fc3e7..ca892dfc2500 100644 --- a/external/poppler/poppler-vs2013.patch.1 +++ b/external/poppler/poppler-vs2013.patch.1 @@ -1,12 +1,11 @@ --*- Mode:Diff -*- --- poppler/poppler/poppler-config.h.in +++ poppler/poppler/poppler-config.h.in -@@ -164,7 +164,7 @@ +@@ -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) max(a, b) - #define fmin(a, b) min(a, b) + #define fmax(a, b) std::max(a, b) + #define fmin(a, b) std::min(a, b) #endif |