Merge pull request #1670

c3d7a198 mlog: probable fix for gmtime_r not being available on windows (moneromooo-monero)
2017-02-04 17:28:23 +02:00 · 2017-02-04 17:28:23 +02:00 · 9547e79af5
parent 5da4650cba c3d7a198bf
commit 9547e79af5
1 changed files with 6 additions and 1 deletions
--- 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);