Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-06 02:04:23 -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

8
contrib/epee/src/mlog.cpp
View file

@ -40,6 +40,7 @@
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include "string_tools.h"
#include "misc_os_dependent.h"
#include "misc_log_ex.h"
#undef MONERO_DEFAULT_LOG_CATEGORY
@ -58,12 +59,7 @@ static std::string generate_log_filename(const char *base)
char tmp[200];
struct tm tm;
time_t now = time(NULL);
if
#ifdef WIN32
(!gmtime_s(&tm, &now))
#else
(!gmtime_r(&now, &tm))
#endif
if (!epee::misc_utils::get_gmt_time(now, tm))
snprintf(tmp, sizeof(tmp), "part-%u", ++fallback_counter);
else
strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm);