Use newer plibc, adjust the code as needed

Use plibc_set_stat_size_size
Use plibc_set_stat_time_size
Update plibc header
Check for _stati64 (needed due to the new plibc header)

3 files changed, 8 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index d4ce8a0ac..01b0d58d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,8 @@ AC_CHECK_MEMBER(struct tm.tm_gmtoff,
      ,
      [#include <time.h>])
 
+AC_CHECK_DECLS([_stati64])
+
 # 'save' libs; only those libs found so far will be
 # linked against _everywhere_.  For the others, we
 # will be more selective!
diff --git a/src/include/plibc.h b/src/include/plibc.h
index 0ce666b3f..a58735260 100644
--- a/src/include/plibc.h
+++ b/src/include/plibc.h
@@ -22,7 +22,7 @@
  * @brief PlibC header
  * @attention This file is usually not installed under Unix,
  *            so ship it with your application
- * @version $Revision: 151 $
+ * @version $Revision$
  */
 
 #ifndef _PLIBC_H_
@@ -70,7 +70,7 @@ extern "C" {
 /* Convert LARGE_INTEGER to double */
 #define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + \
   (double)((x).LowPart))
-#ifndef __MINGW64_VERSION_MAJOR
+#ifndef HAVE_DECL__STATI64
 struct _stati64
 {
     _dev_t st_dev;
@@ -517,6 +517,8 @@ unsigned plibc_get_handle_count();
 
 typedef void (*TPanicProc) (int, char *);
 void plibc_set_panic_proc(TPanicProc proc);
+void plibc_set_stat_size_size(int iLength);
+void plibc_set_stat_time_size(int iLength);
 
 int flock(int fd, int operation);
 int fsync(int fildes);
diff --git a/src/util/winproc.c b/src/util/winproc.c
index 18fa368a9..4c07eba82 100644
--- a/src/util/winproc.c
+++ b/src/util/winproc.c
@@ -147,7 +147,8 @@ GNInitWinEnv ()
   plibc_initialized ();
   plibc_set_panic_proc (plibc_panic);
   ret = plibc_init_utf8 ("GNU", PACKAGE, 1);
-
+  plibc_set_stat_size_size (8);
+  plibc_set_stat_time_size (4);
   /* don't load other DLLs twice */
   if (hNTDLL)
     return ret;