From 24ab3b695eae442c47f5f67a0b4fc504c0044f98 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Thu, 15 Sep 2016 05:19:31 +0300 Subject: [PATCH] time-util: export timespec_load_nsec() --- src/basic/time-util.c | 6 +----- src/basic/time-util.h | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c index cf32c0408..245563684 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -40,10 +40,6 @@ #include "strv.h" #include "time-util.h" -#if 0 /// UNNEEDED by elogind -static nsec_t timespec_load_nsec(const struct timespec *ts); -#endif // 0 - static clockid_t map_clock_id(clockid_t c) { /* Some more exotic archs (s390, ppc, …) lack the "ALARM" flavour of the clocks. Thus, clock_gettime() will @@ -205,7 +201,7 @@ usec_t timespec_load(const struct timespec *ts) { } #if 0 /// UNNEEDED by elogind -static nsec_t timespec_load_nsec(const struct timespec *ts) { +nsec_t timespec_load_nsec(const struct timespec *ts) { assert(ts); if (ts->tv_sec == (time_t) -1 && ts->tv_nsec == (long) -1) diff --git a/src/basic/time-util.h b/src/basic/time-util.h index aa6000993..4421afc66 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -115,6 +115,7 @@ static inline bool triple_timestamp_is_set(triple_timestamp *ts) { usec_t triple_timestamp_by_clock(triple_timestamp *ts, clockid_t clock); usec_t timespec_load(const struct timespec *ts) _pure_; +nsec_t timespec_load_nsec(const struct timespec *ts) _pure_; struct timespec *timespec_store(struct timespec *ts, usec_t u); usec_t timeval_load(const struct timeval *tv) _pure_; -- 2.30.2