From 69bbb5fcbb4a7a568a8a3538ee57f1d1715c5ec0 Mon Sep 17 00:00:00 2001 From: lihui Date: Sun, 9 Feb 2020 12:19:03 +0800 Subject: [PATCH] [#1199] --- src/util/src/ttime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c index 1408d1678f..65c5d0ea4c 100644 --- a/src/util/src/ttime.c +++ b/src/util/src/ttime.c @@ -44,7 +44,7 @@ * An encoding of midnight at the end of the day as 24:00:00 - ie. midnight * tomorrow - (allowable under ISO 8601) is supported. */ -int64_t mktime64(const unsigned int year0, const unsigned int mon0, +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) { @@ -330,7 +330,7 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) { /* mktime will be affected by TZ, set by using taos_options */ //int64_t seconds = mktime(&tm); //int64_t seconds = (int64_t)user_mktime(&tm); - int64_t seconds = mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); + int64_t seconds = user_mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); int64_t fraction = 0; -- GitLab