diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-09-15 22:53:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 22:53:00 -0400 |
| commit | e77e0f51fee8780941690176cb88bdffb80e7adc (patch) | |
| tree | 2c3e06bc18ef7daacfcbfabb9f2d502df77a3dea /src/basic | |
| parent | 7dabbb55a8744a43ec869839ef371b184c8d2ffe (diff) | |
| parent | fb8b0869a7bc30e23be175cf978df23192d59118 (diff) | |
Merge pull request #4131 from intelfx/update-done-timestamps-precision
condition: ignore nanoseconds in timestamps for ConditionNeedsUpdate=
Fixes #4130.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/time-util.c | 4 | ||||
| -rw-r--r-- | src/basic/time-util.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 0ef1f6393e..fedff1362c 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -40,8 +40,6 @@ #include "strv.h" #include "time-util.h" -static nsec_t timespec_load_nsec(const struct timespec *ts); - 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 @@ -198,7 +196,7 @@ usec_t timespec_load(const struct timespec *ts) { (usec_t) ts->tv_nsec / NSEC_PER_USEC; } -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 99be5ce6ee..558b0b5b7f 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -111,6 +111,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_; |