diff --git a/hgdriver/wrapper/hg_log.cpp b/hgdriver/wrapper/hg_log.cpp index 377cca9..736889b 100644 --- a/hgdriver/wrapper/hg_log.cpp +++ b/hgdriver/wrapper/hg_log.cpp @@ -411,7 +411,7 @@ extern "C" { char buf[40] = { 0 }; - get_current_time(buf); + hg_get_current_time(buf); return buf; } diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp index 3a72594..ef42705 100644 --- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp +++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp @@ -408,7 +408,7 @@ extern "C" return g_unk_statu; } - void get_current_time(char* tmbuf, struct tm* t) + void hg_get_current_time(char* tmbuf, struct tm* t) { #if defined(WIN32) || defined(_WIN64) static long bias = -1; @@ -439,11 +439,11 @@ extern "C" if (tmbuf) sprintf(tmbuf, "%04d-%02d-%02d %02d:%02d:%02d", l->tm_year + 1900, l->tm_mon + 1, l->tm_mday, l->tm_hour, l->tm_min, l->tm_sec); } - void get_current_time_w(wchar_t* tmbuf, struct tm* t) + void hg_get_current_time_w(wchar_t* tmbuf, struct tm* t) { struct tm tmp = { 0 }, * l = &tmp; - get_current_time(nullptr, l); + hg_get_current_time(nullptr, l); if (t) *t = *l; if (tmbuf) diff --git a/sdk/hginclude/huagaoxxx_warraper_ex.h b/sdk/hginclude/huagaoxxx_warraper_ex.h index c83681b..0429472 100644 --- a/sdk/hginclude/huagaoxxx_warraper_ex.h +++ b/sdk/hginclude/huagaoxxx_warraper_ex.h @@ -482,8 +482,8 @@ extern "C"{ // t - 用于接收原始的时间结构 // // Return: void - void get_current_time(char* tmbuf, struct tm* t = nullptr); - void get_current_time_w(wchar_t* tmbuf, struct tm* t = nullptr); + void hg_get_current_time(char* tmbuf, struct tm* t = nullptr); + void hg_get_current_time_w(wchar_t* tmbuf, struct tm* t = nullptr); #ifdef __cplusplus }