Kaydet (Commit) 9c95aabb authored tarafından Tor Lillqvist's avatar Tor Lillqvist

VS 2013 has fmin() and fmax()

Change-Id: Iecb8e289d94c479447b80f1d5ebc21eb2210301b
üst ed4697e6
......@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-snprintf.patch.1 \
external/poppler/poppler-mac-fake.patch.1 \
external/poppler/poppler-nochecknew.patch.1 \
external/poppler/poppler-vs2013.patch.1 \
))
# vim: set noet sw=4 ts=4:
-*- 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment