diff --git a/src/util/time.cpp b/src/util/time.cpp
index 051c318f8c..08584a6eff 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -1,101 +1,101 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
 #include <config/bitcoin-config.h>
 #endif
 
 #include <util/time.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread.hpp>
 
 #include <tinyformat.h>
 
 #include <atomic>
 #include <ctime>
 
 //! For unit testing
 static std::atomic<int64_t> nMockTime(0);
 
 int64_t GetTime() {
     int64_t mocktime = nMockTime.load(std::memory_order_relaxed);
     if (mocktime) {
         return mocktime;
     }
 
     time_t now = time(nullptr);
     assert(now > 0);
     return now;
 }
 
 template <typename T> T GetTime() {
     const std::chrono::seconds mocktime{
         nMockTime.load(std::memory_order_relaxed)};
 
     return std::chrono::duration_cast<T>(
         mocktime.count() ? mocktime
                          : std::chrono::microseconds{GetTimeMicros()});
 }
 template std::chrono::seconds GetTime();
 template std::chrono::milliseconds GetTime();
 template std::chrono::microseconds GetTime();
 
 void SetMockTime(int64_t nMockTimeIn) {
     nMockTime.store(nMockTimeIn, std::memory_order_relaxed);
 }
 
 int64_t GetMockTime() {
     return nMockTime.load(std::memory_order_relaxed);
 }
 
 int64_t GetTimeMillis() {
     int64_t now = (boost::posix_time::microsec_clock::universal_time() -
                    boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1)))
                       .total_milliseconds();
     assert(now > 0);
     return now;
 }
 
 int64_t GetTimeMicros() {
     int64_t now = (boost::posix_time::microsec_clock::universal_time() -
                    boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1)))
                       .total_microseconds();
     assert(now > 0);
     return now;
 }
 
 int64_t GetSystemTimeInSeconds() {
     return GetTimeMicros() / 1000000;
 }
 
 void MilliSleep(int64_t n) {
     boost::this_thread::sleep_for(boost::chrono::milliseconds(n));
 }
 
 std::string FormatISO8601DateTime(int64_t nTime) {
     struct tm ts;
     time_t time_val = nTime;
-#ifdef _MSC_VER
+#ifdef _WIN32
     gmtime_s(&ts, &time_val);
 #else
     gmtime_r(&time_val, &ts);
 #endif
     return strprintf("%04i-%02i-%02iT%02i:%02i:%02iZ", ts.tm_year + 1900,
                      ts.tm_mon + 1, ts.tm_mday, ts.tm_hour, ts.tm_min,
                      ts.tm_sec);
 }
 
 std::string FormatISO8601Date(int64_t nTime) {
     struct tm ts;
     time_t time_val = nTime;
-#ifdef _MSC_VER
+#ifdef _WIN32
     gmtime_s(&ts, &time_val);
 #else
     gmtime_r(&time_val, &ts);
 #endif
     return strprintf("%04i-%02i-%02i", ts.tm_year + 1900, ts.tm_mon + 1,
                      ts.tm_mday);
 }