summaryrefslogtreecommitdiff
path: root/external/poppler/poppler-vs2013.patch.1
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-11-23 13:47:52 +0100
committerDavid Tardon <dtardon@redhat.com>2016-11-23 15:09:01 +0000
commit6f1ae11761ddfa2f928254ff51f1860155f670a4 (patch)
treee4673caa7f8744aecb619dd3e616129601cba89b /external/poppler/poppler-vs2013.patch.1
parente4ec7717ef45d18a2d6a37983b0a3d34c7953919 (diff)
upload poppler 0.49.0
Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427 Reviewed-on: https://gerrit.libreoffice.org/31111 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/poppler/poppler-vs2013.patch.1')
-rw-r--r--external/poppler/poppler-vs2013.patch.111
1 files changed, 0 insertions, 11 deletions
diff --git a/external/poppler/poppler-vs2013.patch.1 b/external/poppler/poppler-vs2013.patch.1
deleted file mode 100644
index ca892dfc2500..000000000000
--- a/external/poppler/poppler-vs2013.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- poppler/poppler/poppler-config.h.in
-+++ poppler/poppler/poppler-config.h.in
-@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
- #define GCC_PRINTF_FORMAT(fmt_index, va_index)
- #endif
-
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1800
- #define fmax(a, b) std::max(a, b)
- #define fmin(a, b) std::min(a, b)
- #endif