[Libreoffice-commits] core.git: external/poppler

[Tor Lillqvist]

 external/poppler/UnpackedTarball_poppler.mk |    1 +
 external/poppler/poppler-vs2013.patch.1     |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 9c95aabbbe01026cf9995d2b08aea49b1184528e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jul 7 22:15:26 2014 +0300

    VS 2013 has fmin() and fmax()
    
    Change-Id: Iecb8e289d94c479447b80f1d5ebc21eb2210301b

diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index 93c8fa1..b69a817 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -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:
diff --git a/external/poppler/poppler-vs2013.patch.1 b/external/poppler/poppler-vs2013.patch.1
new file mode 100644
index 0000000..4b201f9
--- /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