Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-06-21 21:44:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4880

Browse source 
96e6b439 blockchain_stats: don't use gmtime_r on Windows (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-12-04 17:29:46 +02:00
commit d4a0fb2b89
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/blockchain_utilities/blockchain_stats.cpp
View file

@ -234,7 +234,7 @@ plot 'stats.csv' index "DATA" using (timecolumn(1,"%Y-%m-%d")):4 with lines, ''
}
time_t tt = blk.timestamp;
char timebuf[64];
gmtime_r(&tt, &currtm);
epee::misc_utils::get_gmt_time(tt, currtm);
if (!prevtm.tm_year)
prevtm = currtm;
// catch change of day

6
src/simplewallet/simplewallet.cpp
View file

@ -6731,11 +6731,7 @@ static std::string get_human_readable_timestamp(uint64_t ts)
return "<unknown>";
time_t tt = ts;
struct tm tm;
#ifdef WIN32
gmtime_s(&tm, &tt);
#else
gmtime_r(&tt, &tm);
#endif
epee::misc_utils::get_gmt_time(tt, tm);
uint64_t now = time(NULL);
uint64_t diff = ts > now ? ts - now : now - ts;
strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &tm);