diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-08-11 08:10:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-02 16:06:32 +0000 |
| commit | e140ab91946132eddda0402b44378f703357a5be (patch) | |
| tree | c7b78181dd4460d9dc5bdafbf3d9de7fce16a0ac /external | |
| parent | c4f210f55881b186034b838c60665bbff392f289 (diff) | |
Fix poppler on MSVC 14.0
Change-Id: I4791c53078f827248b6f163104727cd97dfb227f
Reviewed-on: https://gerrit.libreoffice.org/17659
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |