diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-03-04 14:36:08 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-04-21 18:18:44 +0200 |
| commit | de030cd7a234fd9191364647deb1a4836ca992cb (patch) | |
| tree | 8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /external/poppler | |
| parent | 489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (diff) | |
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued.
Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external/poppler')
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 1 | ||||
| -rw-r--r-- | external/poppler/poppler-snprintf.patch.1 | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index f72c040c513b..8c87693b82ec 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-notests.patch.1 \ - $(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \ external/poppler/poppler-mac-fake.patch.1 \ external/poppler/ubsan.patch.0 \ external/poppler/poppler-libjpeg.patch.1 \ diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1 deleted file mode 100644 index 577660580489..000000000000 --- a/external/poppler/poppler-snprintf.patch.1 +++ /dev/null @@ -1,34 +0,0 @@ ---- poppler-0.22.5/poppler/Catalog.cc 2013-06-09 12:16:12.000000000 +0200 -+++ poppler-0.22.5/poppler/Catalog.cc 2013-07-08 16:54:30.712095880 +0200 -@@ -40,6 +40,9 @@ - - #include <stddef.h> - #include <stdlib.h> -+#ifdef _WIN32 -+# include <systools/win32/snprintf.h> -+#endif - #include "goo/gmem.h" - #include "Object.h" - #include "PDFDoc.h" ---- poppler-0.22.5/poppler/GlobalParams.cc 2013-03-25 22:48:34.000000000 +0100 -+++ poppler-0.22.5/poppler/GlobalParams.cc 2013-07-08 16:55:04.753303654 +0200 -@@ -57,6 +57,7 @@ - #ifdef _WIN32 - # include <shlobj.h> - # include <mbstring.h> -+# include <systools/win32/snprintf.h> - #endif - #include "goo/gmem.h" - #include "goo/GooString.h" ---- poppler-0.22.5/poppler/PageLabelInfo.cc 2013-03-25 22:48:34.000000000 +0100 -+++ poppler-0.22.5/poppler/PageLabelInfo.cc 2013-07-08 16:56:47.977901129 +0200 -@@ -17,6 +17,9 @@ - #include <stdlib.h> - #include <stdio.h> - #include <assert.h> -+#ifdef _WIN32 -+# include <systools/win32/snprintf.h> -+#endif - - #include "PageLabelInfo.h" - #include "PageLabelInfo_p.h" |