-*- Mode:Diff -*-
--- poppler/poppler/poppler-config.h.in
+++ poppler/poppler/poppler-config.h.in
@@ -164,7 +164,7 @@
 #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)
 #endif