From: Sami Kerola Date: Sat, 16 Jul 2016 11:50:53 +0000 (+0100) Subject: hwclock: remove FLOOR macro in favour of floor(3) X-Git-Tag: v2.30-rc1~267^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1030c325c05b79f70a199464b05c72d3d383a9bc;p=thirdparty%2Futil-linux.git hwclock: remove FLOOR macro in favour of floor(3) Reviewed-by: J William Piggott Signed-off-by: Sami Kerola --- diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 88be83e8c9..be643c965c 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -423,7 +423,7 @@ hwclock_SOURCES = \ if LINUX hwclock_SOURCES += sys-utils/hwclock-rtc.c endif -hwclock_LDADD = $(LDADD) libcommon.la $(MATH_LIBS) +hwclock_LDADD = $(LDADD) libcommon.la -lm if HAVE_AUDIT hwclock_LDADD += -laudit endif diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 1d193a5dac..3cc425f9d4 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -92,8 +92,6 @@ static int hwaudit_on; /* The struct that holds our hardware access routines */ struct clock_ops *ur; -#define FLOOR(arg) ((arg >= 0 ? (int) arg : ((int) arg) - 1)); - /* Maximal clock adjustment in seconds per day. (adjtime() glibc call has 2145 seconds limit on i386, so it is good enough for us as well, 43219 is a maximal safe value preventing exact_adjustment overflow.) */ @@ -1068,7 +1066,7 @@ calculate_adjustment(const double factor, exact_adjustment = ((double)(systime - last_time)) * factor / (24 * 60 * 60) + not_adjusted; - tdrift_p->tv_sec = FLOOR(exact_adjustment); + tdrift_p->tv_sec = (time_t) floor(exact_adjustment); tdrift_p->tv_usec = (exact_adjustment - (double)tdrift_p->tv_sec) * 1E6; if (debug) {