aligned gfile.cc with the current poppler (committ 46543272dbe7655821e1c794ca3cc22e8cb4cef9)

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

2 files changed, 24 insertions, 23 deletions

diff --git a/Build/source/libs/poppler/TLpatches/patch-05-w32 b/Build/source/libs/poppler/TLpatches/patch-05-w32
index 69f4e420b20..5e7b9368743 100644
--- a/Build/source/libs/poppler/TLpatches/patch-05-w32
+++ b/Build/source/libs/poppler/TLpatches/patch-05-w32
@@ -1,18 +1,22 @@
-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:47:42 2018
-@@ -80,7 +80,14 @@
- struct StatMtim
- {
-   static const struct timespec& value(const Stat& stbuf) {
-+#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;
+$ diff -u gfile.cc.orig gfile.cc 
+--- gfile.cc.orig	2018-03-21 13:21:12.635648536 +0100
++++ gfile.cc	2018-03-21 12:16:05.000000000 +0100
+@@ -65,6 +65,8 @@
+ #define PATH_MAX 1024
+ #endif
+ 
++#ifndef _WIN32
++
+ namespace {
+ 
+ template< typename... >
+@@ -99,6 +101,8 @@
+ 
+ }
+ 
 +#endif
-   }
- };
++
+ //------------------------------------------------------------------------
  
+ 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 5630566c1fe..06014b3e5a8 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
@@ -65,6 +65,8 @@
 #define PATH_MAX 1024
 #endif
 
+#ifndef _WIN32
+
 namespace {
 
 template< typename... >
@@ -80,14 +82,7 @@ template< typename Stat, typename = void_t<> >
 struct StatMtim
 {
   static const struct timespec& value(const Stat& stbuf) {
-#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
   }
 };
 
@@ -106,6 +101,8 @@ inline const struct timespec& mtim(const struct stat& stbuf) {
 
 }
 
+#endif
+
 //------------------------------------------------------------------------
 
 GooString *getCurrentDir() {