emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master a0605d9: Fix MinGW compilation problem in timefns.c


From: Eli Zaretskii
Subject: [Emacs-diffs] master a0605d9: Fix MinGW compilation problem in timefns.c
Date: Sun, 7 Oct 2018 13:52:28 -0400 (EDT)

branch: master
commit a0605d96187bc4103a982cededcd12e2628aba66
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 src/timefns.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/timefns.c b/src/timefns.c
index 7bce3b1..c94d97d 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;
 }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]