From 7f77f0362ff2e90a29b05df442ea931aa58cf51c Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Fri, 4 Jun 2021 21:48:37 +0800 Subject: [PATCH] Hotfix/sangshuduo/td 4025 fix travis ci broken for develop (#6376) * [TD-4025]: travis ci broken due to valgrind dependency missed. modify smoketest.sh to python3.8 * [TD-4025]: travis ci broken due to ubuntu 20.04 repo issue. * [TD-4025]: travis ci broken due to ubuntu 20.04 repo issue. * [TD-4025]: travis ci broken due to ubuntu 20.04 repo issue. * [TD-4025]: travis ci broken due to valgrind dependency missed. change focal to bionic. * [TD-4025]: travis ci broken due to ubuntu 20.04 repo issue. cherry pick from master. * don't check maven on windows for appveyor. * fix timezone build error with clang/linux. * add .appveyor.yml back. Co-authored-by: Shuduo Sang --- src/os/src/detail/osTime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/src/detail/osTime.c b/src/os/src/detail/osTime.c index 67e0c2642e..2956dd29ad 100644 --- a/src/os/src/detail/osTime.c +++ b/src/os/src/detail/osTime.c @@ -43,7 +43,7 @@ */ int64_t user_mktime64(const unsigned int year0, const unsigned int mon0, const unsigned int day, const unsigned int hour, - const unsigned int min, const unsigned int sec, int64_t timezone) + const unsigned int min, const unsigned int sec, int64_t time_zone) { unsigned int mon = mon0, year = year0; @@ -61,7 +61,7 @@ int64_t user_mktime64(const unsigned int year0, const unsigned int mon0, res = res*24; res = ((res + hour) * 60 + min) * 60 + sec; - return (res + timezone); + return (res + time_zone); } // ==== mktime() kernel code =================// -- GitLab