diff options
| author | Karel Zak | 2015-03-10 11:37:45 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-03-10 11:37:45 +0100 |
| commit | 7d3a07d87fd1c59927a614a04a2751aa4db420d8 (patch) | |
| tree | 157bae226fb8661cd47b1db7beb648fc7f7e343d /misc-utils/logger.c | |
| parent | logger: add --skip-empty-lines to prevent logging empty lines (diff) | |
| download | kernel-qcow2-util-linux-7d3a07d87fd1c59927a614a04a2751aa4db420d8.tar.gz kernel-qcow2-util-linux-7d3a07d87fd1c59927a614a04a2751aa4db420d8.tar.xz kernel-qcow2-util-linux-7d3a07d87fd1c59927a614a04a2751aa4db420d8.zip | |
logger: check for ntp_gettime() rather than for timex.h
It seems that musl libc and uClibc without UCLIBC_NTP_LEGACY
does not provide ntp_gettime and compile will fail.
References: https://github.com/karelzak/util-linux/issues/174
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/logger.c')
| -rw-r--r-- | misc-utils/logger.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 0a9e4ab57..2fd3ddf1d 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -366,9 +366,6 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl) { char *hostname = NULL; char pid[32], time[64], timeq[80]; -#ifdef HAVE_SYS_TIMEX_H - struct ntptimeval ntptv; -#endif struct timeval tv; struct tm *tm; @@ -408,7 +405,9 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl) snprintf(pid, sizeof(pid), " %d", ctl->pid); if (ctl->rfc5424_tq) { -#ifdef HAVE_SYS_TIMEX_H +#ifdef HAVE_NTP_GETTIME + struct ntptimeval ntptv; + if (ntp_gettime(&ntptv) == TIME_OK) snprintf(timeq, sizeof(timeq), " [timeQuality tzKnown=\"1\" isSynced=\"1\" syncAccuracy=\"%ld\"]", |