From e140ab91946132eddda0402b44378f703357a5be Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 11 Aug 2015 08:10:03 +0200 Subject: Fix poppler on MSVC 14.0 Change-Id: I4791c53078f827248b6f163104727cd97dfb227f Reviewed-on: https://gerrit.libreoffice.org/17659 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- external/poppler/UnpackedTarball_poppler.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external/poppler') diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index b79c1019c45c..49a4ff680304 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-notests.patch.1 \ - external/poppler/poppler-snprintf.patch.1 \ + $(if $(filter MSC-120,$(COM)-$(VCVER)),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 \ -- cgit v1.2.3