aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2006-07-21 17:28:23 +0000
committerEli Zaretskii2006-07-21 17:28:23 +0000
commit69b72317aeb1cc87010be0b2e8f612481ed56334 (patch)
treef0664874408283d3c6d0ad370c46edb5c8980d96 /src
parent796660a58f7c4947f7aba51a6387ac1c0ad98277 (diff)
downloademacs-69b72317aeb1cc87010be0b2e8f612481ed56334.tar.gz
emacs-69b72317aeb1cc87010be0b2e8f612481ed56334.zip
(convert_time): Use explicit long double constants to ensure long double
arithmetics is used throughout.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 510e1f9e49a..8c36f58cca2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-07-21 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (convert_time): Use explicit long double constants to
4 ensure long double arithmetics is used throughout.
5
12006-07-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62006-07-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): New vars. 8 * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): New vars.
diff --git a/src/w32.c b/src/w32.c
index d01a1022a19..c093eab599e 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2256,16 +2256,17 @@ convert_time (FILETIME ft)
2256 2256
2257 SystemTimeToFileTime (&st, &utc_base_ft); 2257 SystemTimeToFileTime (&st, &utc_base_ft);
2258 utc_base = (long double) utc_base_ft.dwHighDateTime 2258 utc_base = (long double) utc_base_ft.dwHighDateTime
2259 * 4096 * 1024 * 1024 + utc_base_ft.dwLowDateTime; 2259 * 4096.0L * 1024.0L * 1024.0L + utc_base_ft.dwLowDateTime;
2260 init = 1; 2260 init = 1;
2261 } 2261 }
2262 2262
2263 if (CompareFileTime (&ft, &utc_base_ft) < 0) 2263 if (CompareFileTime (&ft, &utc_base_ft) < 0)
2264 return 0; 2264 return 0;
2265 2265
2266 ret = (long double) ft.dwHighDateTime * 4096 * 1024 * 1024 + ft.dwLowDateTime; 2266 ret = (long double) ft.dwHighDateTime
2267 * 4096.0L * 1024.0L * 1024.0L + ft.dwLowDateTime;
2267 ret -= utc_base; 2268 ret -= utc_base;
2268 return (time_t) (ret * 1e-7); 2269 return (time_t) (ret * 1e-7L);
2269} 2270}
2270 2271
2271void 2272void