blob: ca892dfc2500bed9604100e75de7c109fe069fd8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
|
--- poppler/poppler/poppler-config.h.in
+++ poppler/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
|
