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 #870 

57dce80 gmtime for Windows (luigi1111)
This commit is contained in:
Riccardo Spagni 2016-06-21 09:32:32 +02:00
parent fd32a3b52a 57dce8083a
commit de91bb75a1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/simplewallet/simplewallet.cpp
View File

@ -2969,13 +2969,17 @@ static std::string get_human_readable_timestamp(uint64_t ts)
return "<unknown>"; return "<unknown>";
time_t tt = ts; time_t tt = ts;
struct tm tm; struct tm tm;
#ifdef WIN32
gmtime_s(&tm, &tt);
#else
gmtime_r(&tt, &tm); gmtime_r(&tt, &tm);
#endif
uint64_t now = time(NULL); uint64_t now = time(NULL);
uint64_t diff = ts > now ? ts - now : now - ts; uint64_t diff = ts > now ? ts - now : now - ts;
if (diff > 24*3600) if (diff > 24*3600)
strftime(buffer, sizeof(buffer), "%F", &tm); strftime(buffer, sizeof(buffer), "%Y-%m-%d", &tm);
else else
strftime(buffer, sizeof(buffer), "%r", &tm); strftime(buffer, sizeof(buffer), "%I:%M:%S %p", &tm);
return std::string(buffer); return std::string(buffer);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------