1 From: Yu Watanabe <watanabe.yu+github@gmail.com>
2 Date: Sat, 23 Jun 2018 09:41:55 +0900
3 Subject: timesync: changes type of drift_freq to int64_t
5 drift_freq is used for storing timex.freq, and is a 64bit integer.
6 To support x32 ABI, this changes the type of drift_freq to int64_t.
10 (cherry picked from commit 75ca1621db4647a4d62d7873cd6715e28fe0f9fa)
12 src/timesync/timesyncd-manager.c | 2 +-
13 src/timesync/timesyncd-manager.h | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
16 diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
17 index 2b731af..404a2b1 100644
18 --- a/src/timesync/timesyncd-manager.c
19 +++ b/src/timesync/timesyncd-manager.c
20 @@ -604,7 +604,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
21 m->dest_time = *recv_time;
24 - log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRI_TIMEX"ppm%s",
25 + log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRIi64"ppm%s",
26 m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_freq / 65536,
27 spike ? " (ignored)" : "");
29 diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
30 index d8d97cc..1834741 100644
31 --- a/src/timesync/timesyncd-manager.h
32 +++ b/src/timesync/timesyncd-manager.h
33 @@ -79,7 +79,7 @@ struct Manager {
40 /* watch for time changes */
41 sd_event_source *event_clock_watch;