texlive[47043] Build/source/libs/poppler: improve the patch for

[commits+kakuto at tug.org]

Revision: 47043
          http://tug.org/svn/texlive?view=revision&revision=47043
Author:   kakuto
Date:     2018-03-20 22:51:38 +0100 (Tue, 20 Mar 2018)
Log Message:
-----------
improve the patch for windows, thanks to Luigi

Modified Paths:
--------------
    trunk/Build/source/libs/poppler/TLpatches/patch-05-w32
    trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc

Modified: trunk/Build/source/libs/poppler/TLpatches/patch-05-w32
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/patch-05-w32	2018-03-20 21:34:40 UTC (rev 47042)
+++ trunk/Build/source/libs/poppler/TLpatches/patch-05-w32	2018-03-20 21:51:38 UTC (rev 47043)
@@ -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;
++#ifdef  HAVE_STRUCT_STAT_ST_MTIM
+     return stbuf.st_mtim;
 +#else
-     return stbuf.st_mtim;
++    static struct timespec t ;
++    t.tv_sec=stbuf.st_mtime;
++    t.tv_nsec=0;
++    return t;
 +#endif
    }
  };

Modified: trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc	2018-03-20 21:34:40 UTC (rev 47042)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc	2018-03-20 21:51:38 UTC (rev 47043)
@@ -80,13 +80,13 @@
 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;
+#ifdef  HAVE_STRUCT_STAT_ST_MTIM
+    return stbuf.st_mtim;
 #else
-    return stbuf.st_mtim;
+    static struct timespec t ;
+    t.tv_sec=stbuf.st_mtime;
+    t.tv_nsec=0;
+    return t;
 #endif
   }
 };