From 930c2cd2eb8947413e88404fa94c66e4e1db5ad6 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 4 May 2020 12:28:31 +0200 Subject: [PATCH] Fixed compatibility with current versions of glibc --- CONTRIBUTORS | 1 + HISTORY | 1 + eit.c | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d9195fb8..f4a81461 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2920,6 +2920,7 @@ Manuel Reimer for setting the environment variables HOME, USER, LOGNAME and SHELL accordingly when switching to a less privileged user id for reporting a bug in moving channels between number groups in SVDRP's MOVC command + for fixing compatibility with current versions of glibc Rene van den Braken for reporting a bug in writing the PCR pid into the PMT in diff --git a/HISTORY b/HISTORY index cdb644a1..b67ce0d6 100644 --- a/HISTORY +++ b/HISTORY @@ -9428,3 +9428,4 @@ Video Disk Recorder Revision History - Now retuning if the received transponder's SDT doesn't contain the expected values for NID and TID (thanks to Uwe Scheffler for reporting a problem with failed tuning in SCR systems, and Helmut Binder for helping with the implementation). +- Fixed compatibility with current versions of glibc (thanks to Manuel Reimer). diff --git a/eit.c b/eit.c index 72a45e5c..d437b441 100644 --- a/eit.c +++ b/eit.c @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $Id: eit.c 4.7 2019/05/20 09:55:22 kls Exp $ + * $Id: eit.c 4.8 2020/05/04 12:28:31 kls Exp $ */ #include "eit.h" @@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) if (abs(diff) > MAX_TIME_DIFF) { mutex.Lock(); if (abs(diff) > MAX_ADJ_DIFF) { - if (stime(&dvbtim) == 0) + timespec ts = { 0 }; + ts.tv_sec = dvbtim; + if (clock_settime(CLOCK_REALTIME, &ts) == 0) isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); else esyslog("ERROR while setting system time: %m");