summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-03-20 21:02:43 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-03-20 21:02:43 +0000
commitca97bb4c7a45ea2cb09ddb2940b22999de00cf2c (patch)
tree62a38f7acef5bee3e45ae117e30811e9f100917f /Build
parentc995ec6667ba6395939751c761667897cb4323ad (diff)
Add patch for windows
git-svn-id: svn://tug.org/texlive/trunk@47041 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/poppler/TLpatches/ChangeLog4
-rw-r--r--Build/source/libs/poppler/TLpatches/patch-05-w3219
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.cc2
3 files changed, 25 insertions, 0 deletions
diff --git a/Build/source/libs/poppler/TLpatches/ChangeLog b/Build/source/libs/poppler/TLpatches/ChangeLog
index 629722ebf90..0dc44506fc2 100644
--- a/Build/source/libs/poppler/TLpatches/ChangeLog
+++ b/Build/source/libs/poppler/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-05-w32: Added to compile gfile.cc on Windows.
+
2018-03-18 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* Import poppler-0.63.0.
diff --git a/Build/source/libs/poppler/TLpatches/patch-05-w32 b/Build/source/libs/poppler/TLpatches/patch-05-w32
new file mode 100644
index 00000000000..8c77eea5599
--- /dev/null
+++ b/Build/source/libs/poppler/TLpatches/patch-05-w32
@@ -0,0 +1,19 @@
+diff -ur poppler-0.63.0/goo/gfile.cc poppler-src/goo/gfile.cc
+--- poppler-0.63.0/goo/gfile.cc Mon Mar 19 03:23:49 2018
++++ poppler-src/goo/gfile.cc Wed Mar 21 05:50:42 2018
+@@ -65,6 +65,7 @@
+ #define PATH_MAX 1024
+ #endif
+
++#if !defined(_WIN32)
+ namespace {
+
+ template< typename... >
+@@ -99,6 +100,7 @@
+
+ }
+
++#endif /* !_WIN32 */
+ //------------------------------------------------------------------------
+
+ GooString *getCurrentDir() {
diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.cc b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
index 218882d32d7..bea6bb61543 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
@@ -65,6 +65,7 @@
#define PATH_MAX 1024
#endif
+#if !defined(_WIN32)
namespace {
template< typename... >
@@ -99,6 +100,7 @@ inline const struct timespec& mtim(const struct stat& stbuf) {
}
+#endif /* !_WIN32 */
//------------------------------------------------------------------------
GooString *getCurrentDir() {