xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Hotfix/sangshuduo/td 4025 fix travis ci broken for develop (#6376) 

* [TD-4025]<fix>: travis ci broken due to valgrind dependency missed.

modify smoketest.sh to python3.8

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

* [TD-4025]<fix>: travis ci broken due to valgrind dependency missed.

change focal to bionic.

* [TD-4025]<fix>: 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 <sdsang@taosdata.com>
This commit is contained in:
Shuduo Sang 2021-06-04 21:48:37 +08:00 committed by GitHub
parent ecbc610839
commit 7f77f0362f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/src/detail/osTime.c
View File

@ -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 =================//