diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-04 17:28:23 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-04 17:28:23 +0200 |
| commit | 9547e79af5665b48799c4181ab6c2887e6180e6a (patch) | |
| tree | 44712a138eb5c774b6702cf4ac2b553cf180203e | |
| parent | 5da4650cba43520e91b002513312a1c6613d6e04 (diff) | |
| parent | c3d7a198bff47a249202bde5bcb79c5daad6951e (diff) | |
| download | monzero-core-9547e79af5665b48799c4181ab6c2887e6180e6a.tar.gz monzero-core-9547e79af5665b48799c4181ab6c2887e6180e6a.tar.xz monzero-core-9547e79af5665b48799c4181ab6c2887e6180e6a.zip | |
Merge pull request #1670
c3d7a198 mlog: probable fix for gmtime_r not being available on windows (moneromooo-monero)
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 9266f1891..7f9ef4b3a 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -43,7 +43,12 @@ static std::string generate_log_filename(const char *base) char tmp[200]; struct tm tm; 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"); else strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm); |