improve the patch for windows, thanks to Luigi

git-svn-id: svn://tug.org/texlive/trunk@47042 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 22 insertions, 18 deletions

diff --git a/Build/source/libs/poppler/TLpatches/patch-05-w32 b/Build/source/libs/poppler/TLpatches/patch-05-w32
index 8c77eea5599..0647e19470f 100644
--- a/Build/source/libs/poppler/TLpatches/patch-05-w32
+++ b/Build/source/libs/poppler/TLpatches/patch-05-w32
@@ -1,19 +1,18 @@
 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
++++ poppler-src/goo/gfile.cc	Wed Mar 21 06:24:52 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
+     return stbuf.st_mtim;
++#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 bea6bb61543..517774a9377 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
@@ -65,7 +65,6 @@
 #define PATH_MAX 1024
 #endif
 
-#if !defined(_WIN32)
 namespace {
 
 template< typename... >
@@ -81,7 +80,14 @@ 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
     return stbuf.st_mtim;
+#endif
   }
 };
 
@@ -100,7 +106,6 @@ inline const struct timespec& mtim(const struct stat& stbuf) {
 
 }
 
-#endif /* !_WIN32 */
 //------------------------------------------------------------------------
 
 GooString *getCurrentDir() {