Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1670 

c3d7a198 mlog: probable fix for gmtime_r not being available on windows (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-04 17:28:23 +02:00
parent 5da4650cba c3d7a198bf
commit 9547e79af5
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/epee/src/mlog.cpp
View File

@ -43,7 +43,12 @@ static std::string generate_log_filename(const char *base)
char tmp[200]; char tmp[200];
struct tm tm; struct tm tm;
time_t now = time(NULL); time_t now = time(NULL);
if (!gmtime_r(&now, &tm)) if
#ifdef WIN32
(!gmtime_s(&tm, &now))
#else
(!gmtime_r(&now, &tm))
#endif
strcpy(tmp, "unknown"); strcpy(tmp, "unknown");
else else
strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm); strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm);