summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-03-20 21:51:38 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-03-20 21:51:38 +0000
commitd4ac6e9aa37b360329d7e78202148b59e8986ddd (patch)
tree1d0458f95ef500796fdb880b90bd4dc1c47784f7
parent7a4c5e29babb5b966236cc8d7a5d0a7d9e8b97b8 (diff)
improve the patch for windows, thanks to Luigi
git-svn-id: svn://tug.org/texlive/trunk@47043 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/poppler/TLpatches/patch-05-w3214
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.cc12
2 files changed, 13 insertions, 13 deletions
diff --git a/Build/source/libs/poppler/TLpatches/patch-05-w32 b/Build/source/libs/poppler/TLpatches/patch-05-w32
index 0647e19470f..69f4e420b20 100644
--- a/Build/source/libs/poppler/TLpatches/patch-05-w32
+++ b/Build/source/libs/poppler/TLpatches/patch-05-w32
@@ -1,17 +1,17 @@
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 06:24:52 2018
++++ poppler-src/goo/gfile.cc Wed Mar 21 06:47:42 2018
@@ -80,7 +80,14 @@
struct StatMtim
{
static const struct timespec& value(const Stat& stbuf) {
-+#if defined(_WIN32)
-+ static struct timespec t_spec;
-+ t_spec.tv_sec=stbuf.st_mtime;
-+ t_spec.tv_nsec=0;
-+ return t_spec;
-+#else
++#ifdef HAVE_STRUCT_STAT_ST_MTIM
return stbuf.st_mtim;
++#else
++ static struct timespec t ;
++ t.tv_sec=stbuf.st_mtime;
++ t.tv_nsec=0;
++ return t;
+#endif
}
};
diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.cc b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
index 517774a9377..5630566c1fe 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
@@ -80,13 +80,13 @@ template< typename Stat, typename = void_t<> >
struct StatMtim
{
static const struct timespec& value(const Stat& stbuf) {
-#if defined(_WIN32)
- static struct timespec t_spec;
- t_spec.tv_sec=stbuf.st_mtime;
- t_spec.tv_nsec=0;
- return t_spec;
-#else
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
return stbuf.st_mtim;
+#else
+ static struct timespec t ;
+ t.tv_sec=stbuf.st_mtime;
+ t.tv_nsec=0;
+ return t;
#endif
}
};