summaryrefslogtreecommitdiff
path: root/external/poppler/poppler-vs2013.patch.1
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-07-07 22:15:26 +0300
committerTor Lillqvist <tml@collabora.com>2014-07-07 22:17:03 +0300
commit9c95aabbbe01026cf9995d2b08aea49b1184528e (patch)
tree9dbe90bebd3e3af302320d5c3d0971a18d62cdc5 /external/poppler/poppler-vs2013.patch.1
parented4697e6659b820c6a851b07e52f837ac4f7c008 (diff)
VS 2013 has fmin() and fmax()
Change-Id: Iecb8e289d94c479447b80f1d5ebc21eb2210301b
Diffstat (limited to 'external/poppler/poppler-vs2013.patch.1')
-rw-r--r--external/poppler/poppler-vs2013.patch.112
1 files changed, 12 insertions, 0 deletions
diff --git a/external/poppler/poppler-vs2013.patch.1 b/external/poppler/poppler-vs2013.patch.1
new file mode 100644
index 000000000000..4b201f9fc3e7
--- /dev/null
+++ b/external/poppler/poppler-vs2013.patch.1
@@ -0,0 +1,12 @@
+-*- 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