From de030cd7a234fd9191364647deb1a4836ca992cb Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sat, 4 Mar 2017 14:36:08 +0100
Subject: 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>
---
 external/poppler/UnpackedTarball_poppler.mk |  1 -
 external/poppler/poppler-snprintf.patch.1   | 34 -----------------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 external/poppler/poppler-snprintf.patch.1

(limited to 'external/poppler')

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"
-- 
cgit v1.2.3