From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 7 Oct 2018 17:51:11 +0000 (+0300)
Subject: Fix MinGW compilation problem in timefns.c
X-Git-Tag: emacs-27.0.90~4330
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0605d96187bc4103a982cededcd12e2628aba66;p=emacs.git

Fix MinGW compilation problem in timefns.c

* src/timefns.c (lisp_to_timespec): Fix a mismatch between
time_t and timespec.tv_sec data types.
---

diff --git a/src/timefns.c b/src/timefns.c
index 7bce3b1e500..c94d97d9a84 100644
--- a/src/timefns.c
+++ b/src/timefns.c
@@ -896,8 +896,14 @@ lisp_to_timespec (struct lisp_time t)
       ns = mpz_fdiv_q_ui (*q, *q, TIMESPEC_HZ);
     }
 
-  if (mpz_time (*q, &result.tv_sec))
-    result.tv_nsec = ns;
+  /* With some versions of MinGW, tv_sec is a 64-bit type, whereas
+     time_t is a 32-bit type.  */
+  time_t sec;
+  if (mpz_time (*q, &sec))
+    {
+      result.tv_sec = sec;
+      result.tv_nsec = ns;
+    }
   return result;
 }