From 040644302120bfb11f28461aadb96c14e39f8630 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 5 Mar 2017 13:30:32 -0800 Subject: [PATCH] Merge from gnulib This incorporates: 2017-03-04 dtotimespec: simplify * lib/dtotimespec.c: Copy from gnulib. --- lib/dtotimespec.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/dtotimespec.c b/lib/dtotimespec.c index 9d81b68d817..3ca5a9cfd35 100644 --- a/lib/dtotimespec.c +++ b/lib/dtotimespec.c @@ -29,15 +29,9 @@ struct timespec dtotimespec (double sec) { - double min_representable = TYPE_MINIMUM (time_t); - double max_representable = - ((TYPE_MAXIMUM (time_t) * (double) TIMESPEC_RESOLUTION - + (TIMESPEC_RESOLUTION - 1)) - / TIMESPEC_RESOLUTION); - - if (! (min_representable < sec)) + if (! (TYPE_MINIMUM (time_t) < sec)) return make_timespec (TYPE_MINIMUM (time_t), 0); - else if (! (sec < max_representable)) + else if (! (sec < 1.0 + TYPE_MAXIMUM (time_t))) return make_timespec (TYPE_MAXIMUM (time_t), TIMESPEC_RESOLUTION - 1); else { -- 2.11.4.GIT